This commit was manufactured by cvs2svn to create tag

'Version_1_18_0'.

[SVN r7873]

include/boost/pending/integer_range.hpp

@@ -15,8 +15,7 @@
 
 #include <boost/config.hpp>
 
-#if 1
-// Still evaluating whether VC++ can handle this.
+#if !defined(BOOST_MSVC) || defined(__SGI_STL_PORT)
 #define BOOST_USE_ITERATOR_ADAPTORS
 #endif
 
@@ -32,17 +31,16 @@ namespace boost {
 // Counting Iterator and Integer Range Class
 
 #ifdef BOOST_USE_ITERATOR_ADAPTORS
-template <class IntegerType>
 struct counting_iterator_policies : public default_iterator_policies
 {
-    const IntegerType&
-    dereference(type<const IntegerType&>, const IntegerType& i) const
+    template <class IntegerType>
+    IntegerType dereference(type<IntegerType>, const IntegerType& i) const
         { return i; }
 };
 template <class IntegerType>
 struct counting_iterator_traits {
     typedef IntegerType value_type;
-    typedef const IntegerType& reference;
+    typedef IntegerType reference;
     typedef value_type* pointer;
     typedef std::ptrdiff_t difference_type;
     typedef std::random_access_iterator_tag iterator_category;
@@ -52,8 +50,7 @@ struct counting_iterator_traits {
 template <class IntegerType>
 struct integer_range {
 #ifdef BOOST_USE_ITERATOR_ADAPTORS
-    typedef iterator_adaptor<IntegerType,
-      counting_iterator_policies<IntegerType>,
+    typedef iterator_adaptor<IntegerType, counting_iterator_policies,
       counting_iterator_traits<IntegerType>, IntegerType> iterator;
 #else
     typedef int_iterator<IntegerType> iterator;
@@ -83,13 +80,6 @@ protected:
     IntegerType m_start, m_finish;
 };
 
-template <class IntegerType>
-inline integer_range<IntegerType>
-make_integer_range(IntegerType first, IntegerType last)
-{
-  return integer_range<IntegerType>(first, last);
-}
-
 } // namespace boost
 
 #ifdef BOOST_USE_ITERATOR_ADAPTORS

include/boost/pending/iterator_adaptors.hpp

@@ -20,8 +20,8 @@
 
 // I was having some problems with VC6. I couldn't tell whether our hack for
 // stock GCC was causing problems so I needed an easy way to turn it on and
-// off. Now we can test the hack with various compilers and still have an 
-// "out" if it doesn't work. -dwa 7/31/00
+// off. Now we can test the hack with various compilers and still have an "out"
+// if it doesn't work. -dwa 7/31/00
 #if __GNUC__ == 2 && __GNUC_MINOR__ <= 96 && !defined(__STL_USE_NAMESPACES)
 # define BOOST_RELOPS_AMBIGUITY_BUG 1
 #endif
@@ -32,16 +32,13 @@ namespace boost {
 template <class T>
 struct type {};
 
-//============================================================================
+//=============================================================================
 // Default policies for iterator adaptors. You can use this as a base
 // class if you want to customize particular policies.
 struct default_iterator_policies
 {
-    // Some of these members were defined static, but Borland got confused
-    // and thought they were non-const.
-
     template <class Reference, class Iterator>
-    Reference dereference(type<Reference>, const Iterator& x) const
+    static Reference dereference(type<Reference>, const Iterator& x)
         { return *x; }
 
     template <class Iterator>
@@ -57,16 +54,15 @@ struct default_iterator_policies
         { x += n; }
 
     template <class Difference, class Iterator1, class Iterator2>
-    Difference distance(type<Difference>, const Iterator1& x,
-                        const Iterator2& y) const
+    static Difference distance(type<Difference>, const Iterator1& x, const Iterator2& y)
         { return y - x; }
 
     template <class Iterator1, class Iterator2>
-    bool equal(const Iterator1& x, const Iterator2& y) const
+    static bool equal(const Iterator1& x, const Iterator2& y)
         { return x == y; }
 
     template <class Iterator1, class Iterator2>
-    bool less(const Iterator1& x, const Iterator2& y) const
+    static bool less(const Iterator1& x, const Iterator2& y)
         { return x < y; }
 };
 
@@ -132,7 +128,7 @@ inline bool operator<=(const iterator_comparisons<D1,Base1>& xb,
 }
 #endif
 
-//============================================================================
+//=============================================================================
 // iterator_adaptor - A generalized adaptor around an existing
 //   iterator, which is itself an iterator
 //
@@ -168,18 +164,17 @@ struct iterator_adaptor :
 >
 #endif
 {
-    typedef iterator_adaptor<Iterator, Policies,Traits,NonconstIterator> Self;
+    typedef iterator_adaptor<Iterator, Policies, Traits,NonconstIterator> Self;
 public:
     typedef typename Traits::difference_type difference_type;
     typedef typename Traits::value_type value_type;
     typedef typename Traits::pointer pointer;
     typedef typename Traits::reference reference;
     typedef typename Traits::iterator_category iterator_category;
-    typedef Iterator iterator_type;
 
     iterator_adaptor() { }
 
-    iterator_adaptor(const iterator_type& iter, const Policies& p =Policies())
+    iterator_adaptor(const Iterator& iter, const Policies& p = Policies())
         : m_iter_p(iter, p) {}
 
 #ifdef BOOST_MSVC6_MEMBER_TEMPLATES
@@ -228,49 +223,29 @@ public:
         { return *(*this + n); }
     
     Self& operator++() {
-#ifdef __MWERKS__
-        // Odd bug, MWERKS couldn't  deduce the type for the member template
-        // Workaround by explicitly specifying the type.
-        policies().increment<Iterator>(iter());
-#else
         policies().increment(iter());
-#endif
         return *this;
     }
 
     Self operator++(int) { Self tmp(*this); ++*this; return tmp; }
     
     Self& operator--() {
-#ifdef __MWERKS__
-        policies().decrement<Iterator>(iter());
-#else
         policies().decrement(iter());
-#endif
         return *this;
     }
     
     Self operator--(int) { Self tmp(*this); --*this; return tmp; }
 
     Self& operator+=(difference_type n) {
-#ifdef __MWERKS__
-        policies().advance<Iterator>(iter(), n);
-#else
         policies().advance(iter(), n);
-#endif
         return *this;
     }
   
     Self& operator-=(difference_type n) {
-#ifdef __MWERKS__
-        policies().advance<Iterator>(iter(), -n);
-#else
         policies().advance(iter(), -n);
-#endif
         return *this;
     }
 
-    iterator_type base() const { return m_iter_p.first(); }
-
 private:
     typedef Policies policies_type;
     compressed_pair<Iterator,Policies> m_iter_p;