Ticket #5419: assign_cxx0x.patch

boost/assign/list_of.hpp

@@ -430 +430 @@
             return range( boost::begin(r), boost::end(r) );
         }
 
-        template< class Container >
+        template
+        < 
+            class Container
+#ifndef BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+          , class Dummy1 = typename Container::difference_type
+          , class Dummy2 = typename Container::iterator
+#endif
+        >
         operator Container() const
         {
             return this-> BOOST_NESTED_TEMPLATE convert_to_container<Container>();
@@ -566 +573 @@
             return range( boost::begin(r), boost::end(r) );
         }
 
-        template< class Container >
+        template
+        < 
+            class Container
+#ifndef BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
+          , class Dummy1 = typename Container::difference_type
+          , class Dummy2 = typename Container::iterator
+#endif
+        >
         operator Container() const
         {
             return this-> BOOST_NESTED_TEMPLATE convert_to_container<Container>();

libs/assign/test/list_inserter.cpp

@@ -64 +64 @@
     make_list_inserter( functor() )( 4 ),2;
 
     typedef void (vector<int>::* push_back_t)(const int&);
+#if BOOST_WORKAROUND(__GNUC__, == 4) && (__GNUC_MINOR__ == 3) && defined(__GXX_EXPERIMENTAL_CXX0X__)
+    push_back_t push_back_func = &vector<int>::push_back<const int&>;
+#else
     push_back_t push_back_func = &vector<int>::push_back;
+#endif
     make_list_inserter( boost::bind( push_back_func, &v, _1 ) )( 6 ),4;
 
     BOOST_CHECK_EQUAL( v.size(), 2u );

libs/assign/test/std.cpp

@@ -75 +75 @@
 
 
 
-typedef pair<string,int> tuple; 
+typedef pair<string,int> two;
 
 template< class C >
 void test_tuple_sequence()
@@ -151 +151 @@
     test_string_sequence< queue<string> >();             
     test_string_sequence< priority_queue<string> >();    
 
-    test_tuple_sequence< deque<tuple> >();             
-    test_tuple_sequence< list<tuple> >();              
-    test_tuple_sequence< vector<tuple> >();            
-    test_tuple_sequence< set<tuple> >();               
-    test_tuple_sequence< multiset<tuple> >();          
-    test_tuple_sequence< stack<tuple> >();             
-    test_tuple_sequence< queue<tuple> >();             
-    test_tuple_sequence< priority_queue<tuple> >();    
+    test_tuple_sequence< deque<two> >();             
+    test_tuple_sequence< list<two> >();              
+    test_tuple_sequence< vector<two> >();            
+    test_tuple_sequence< set<two> >();               
+    test_tuple_sequence< multiset<two> >();          
+    test_tuple_sequence< stack<two> >();             
+    test_tuple_sequence< queue<two> >();             
+    test_tuple_sequence< priority_queue<two> >();    
     test_tuple();
     
     deque<int>          di;