This commit was manufactured by cvs2svn to create branch 'named-args'.

[SVN r9294]

iterator_adaptor_test.cpp

@@ -384,13 +384,8 @@ main()
 #ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
         , dummyT
 #endif
-        > filter_iter_gen;
-
-#ifndef __BORLANDC__
-    typedef filter_iter_gen::type filter_iter;
-#else
-# define filter_iter filter_iter_gen::type // Borland has a problem with the above
-#endif
+        >::type filter_iter;
+    
     filter_iter i(array, filter_iter::policies_type(one_or_four(), array + N));
     boost::forward_iterator_test(i, dummyT(1), dummyT(4));
 
@@ -440,8 +435,8 @@ main()
     boost::forward_iterator_archetype<dummyT> forward_iter;
     typedef boost::iterator_adaptor<boost::forward_iterator_archetype<dummyT>,
       boost::default_iterator_policies,
-      dummyT, const dummyT&, 
-      std::forward_iterator_tag, std::ptrdiff_t, const dummyT*> adaptor_type;
+      dummyT, const dummyT&, const dummyT*, 
+      std::forward_iterator_tag, std::ptrdiff_t> adaptor_type;
     adaptor_type i(forward_iter);
     if (0) // don't do this, just make sure it compiles
       assert((*i).m_x == i->foo());      
@@ -451,8 +446,8 @@ main()
     boost::input_iterator_archetype<dummyT> input_iter;
     typedef boost::iterator_adaptor<boost::input_iterator_archetype<dummyT>,
       boost::default_iterator_policies,
-      dummyT, const dummyT&, 
-      std::input_iterator_tag, std::ptrdiff_t, const dummyT*> adaptor_type;
+      dummyT, const dummyT&, const dummyT*, 
+      std::input_iterator_tag, std::ptrdiff_t> adaptor_type;
     adaptor_type i(input_iter);
     if (0) // don't do this, just make sure it compiles
       assert((*i).m_x == i->foo());