This commit was manufactured by cvs2svn to create branch 'split-config'.

[SVN r10742]

include/boost/iterator.hpp

@@ -21,7 +21,7 @@
 
 namespace boost
 {
-# if defined(BOOST_NO_STD_ITERATOR) && !defined(BOOST_MSVC_STD_ITERATOR)
+# ifdef BOOST_NO_STD_ITERATOR
   template <class Category, class T,
     class Distance = std::ptrdiff_t,
     class Pointer = T*, class Reference = T&>

include/boost/iterator_adaptors.hpp

@@ -12,8 +12,6 @@
 //
 // Revision History:
 
-// 26 Sep 2001   David Abrahams
-//      Added borland bug fix
 // 08 Mar 2001   Jeremy Siek
 //      Added support for optional named template parameters.
 // 19 Feb 2001   David Abrahams
@@ -646,9 +644,9 @@ struct iterator_adaptor :
         policies().initialize(iter());
     }
 
-#if defined(BOOST_MSVC) || defined(__BORLANDC__)
+#ifdef BOOST_MSVC
     // This is required to prevent a bug in how VC++ generates
-    // the assignment operator for compressed_pairv
+    // the assignment operator for compressed_pair.
     iterator_adaptor& operator= (const iterator_adaptor& x) {
         m_iter_p = x.m_iter_p;
         return *this;
@@ -688,11 +686,7 @@ struct iterator_adaptor :
     self operator++(int) { self tmp(*this); ++*this; return tmp; }
     
     self& operator--() {
-#ifdef __MWERKS__
-        policies().decrement<Base>(iter());
-#else
         policies().decrement(iter());
-#endif
         return *this;
     }