This commit was manufactured by cvs2svn to create branch 'regex-sub'.

[SVN r7754]

include/boost/pending/integer_range.hpp

@@ -13,16 +13,10 @@
 #ifndef BOOST_INTEGER_RANGE_HPP_
 #define BOOST_INTEGER_RANGE_HPP_
 
-#include <boost/config.hpp>
-
-#if !defined(BOOST_MSVC) || defined(__SGI_STL_PORT)
-#define BOOST_USE_ITERATOR_ADAPTORS
-#endif
-
-#ifdef BOOST_USE_ITERATOR_ADAPTORS
-#include <boost/pending/iterator_adaptors.hpp>
-#else
+#ifdef BOOST_MSVC
 #include <boost/pending/detail/int_iterator.hpp>
+#else
+#include <boost/pending/iterator_adaptors.hpp>
 #endif
 
 namespace boost {
@@ -30,7 +24,6 @@ namespace boost {
 //=============================================================================
 // Counting Iterator and Integer Range Class
 
-#ifdef BOOST_USE_ITERATOR_ADAPTORS
 struct counting_iterator_policies : public default_iterator_policies
 {
     template <class IntegerType>
@@ -45,17 +38,15 @@ struct counting_iterator_traits {
     typedef std::ptrdiff_t difference_type;
     typedef std::random_access_iterator_tag iterator_category;
 };
-#endif
 
 template <class IntegerType>
 struct integer_range {
-#ifdef BOOST_USE_ITERATOR_ADAPTORS
+#ifdef BOOST_MSVC
+    typedef int_iterator<IntegerType> iterator;
+#else
     typedef iterator_adaptor<IntegerType, counting_iterator_policies,
       counting_iterator_traits<IntegerType>, IntegerType> iterator;
-#else
-    typedef int_iterator<IntegerType> iterator;
 #endif
-
     typedef iterator const_iterator;
     typedef IntegerType value_type;
     typedef std::ptrdiff_t difference_type;
@@ -82,8 +73,4 @@ protected:
 
 } // namespace boost
 
-#ifdef BOOST_USE_ITERATOR_ADAPTORS
-#undef BOOST_USE_ITERATOR_ADAPTORS
-#endif
-
 #endif // BOOST_INTEGER_RANGE_HPP_

include/boost/pending/iterator_adaptors.hpp

@@ -475,7 +475,7 @@ struct reverse_iterator_policies
     
     template <class Difference, class Iterator1, class Iterator2>
     Difference distance(type<Difference>, const Iterator1& x, 
-                        const Iterator2& y) const
+			const Iterator2& y) const
         { return x - y; }
     
     template <class Iterator1, class Iterator2>