This commit was manufactured by cvs2svn to create tag

'Version_1_18_0'. [SVN r7873]
work around for VC++ bug, triggered by overloading of remove_edge
2025-07-03 07:46:41 +02:00 · 2000-09-29 11:39:43 +00:00 · 2000-09-27 21:02:16 +00:00 · 2000-09-26 22:09:34 +00:00 · 2000-09-26 07:29:12 +00:00 · 2000-09-25 21:19:29 +00:00
2 changed files with 20 additions and 7 deletions
--- a/include/boost/pending/integer_range.hpp
+++ b/include/boost/pending/integer_range.hpp
@ -13,10 +13,16 @@
 #ifndef BOOST_INTEGER_RANGE_HPP_
 #define BOOST_INTEGER_RANGE_HPP_

-#ifdef BOOST_MSVC
-#include <boost/pending/detail/int_iterator.hpp>
-#else
+#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
+#include <boost/pending/detail/int_iterator.hpp>
 #endif

 namespace boost {
@ -24,6 +30,7 @@ namespace boost {
 //=============================================================================
 // Counting Iterator and Integer Range Class

+#ifdef BOOST_USE_ITERATOR_ADAPTORS
 struct counting_iterator_policies : public default_iterator_policies
 {
    template <class IntegerType>
@ -38,15 +45,17 @@ 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_MSVC
-    typedef int_iterator<IntegerType> iterator;
-#else
+#ifdef BOOST_USE_ITERATOR_ADAPTORS
    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;
@ -73,4 +82,8 @@ protected:

 } // namespace boost

+#ifdef BOOST_USE_ITERATOR_ADAPTORS
+#undef BOOST_USE_ITERATOR_ADAPTORS
+#endif
+
 #endif // BOOST_INTEGER_RANGE_HPP_
--- a/include/boost/pending/iterator_adaptors.hpp
+++ b/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>
Author	SHA1	Message	Date
nobody	89401faa97	This commit was manufactured by cvs2svn to create tag 'Version_1_18_0'. [SVN r7873]	2000-09-29 11:39:43 +00:00
Jeremy Siek	b54236986d	work around for VC++ bug, triggered by overloading of remove_edge [SVN r7860]	2000-09-27 21:02:16 +00:00
Jeremy Siek	24c3beb791	rolled back the removal of the iterator_adaptor alternate code, added the graph test file [SVN r7851]	2000-09-26 22:09:34 +00:00
Jeremy Siek	50c9214b82	completed conversion of properties to use _t and enums. Also noticed that problems regarding iterator_adaptor has gone away, so I've removed the ifdef's that took it out. [SVN r7840]	2000-09-26 07:29:12 +00:00
Jeremy Siek	c583cf8730	removed tabs [SVN r7835]	2000-09-25 21:19:29 +00:00
Dave Abrahams	61d2d43ea5	Use iterator adaptors with STLport. [SVN r7788]	2000-09-24 01:06:34 +00:00
Jeremy Siek	76efd2456c	changes for visual c++ port [SVN r7764]	2000-09-22 04:18:51 +00:00