From 50c9214b82f00ca0e6b7f04c97feefa4b27e9b4b Mon Sep 17 00:00:00 2001 From: Jeremy Siek Date: Tue, 26 Sep 2000 07:29:12 +0000 Subject: [PATCH] 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] --- include/boost/pending/integer_range.hpp | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/include/boost/pending/integer_range.hpp b/include/boost/pending/integer_range.hpp index d6ab718..7bd35a0 100644 --- a/include/boost/pending/integer_range.hpp +++ b/include/boost/pending/integer_range.hpp @@ -13,22 +13,13 @@ #ifndef BOOST_INTEGER_RANGE_HPP_ #define BOOST_INTEGER_RANGE_HPP_ -#if !defined(BOOST_MSVC) || defined(__SGI_STL_PORT) -#define BOOST_USE_ITERATOR_ADAPTORS -#endif - -#ifdef BOOST_USE_ITERATOR_ADAPTORS #include -#else -#include -#endif namespace boost { //============================================================================= // Counting Iterator and Integer Range Class -#ifdef BOOST_USE_ITERATOR_ADAPTORS struct counting_iterator_policies : public default_iterator_policies { template @@ -43,16 +34,12 @@ struct counting_iterator_traits { typedef std::ptrdiff_t difference_type; typedef std::random_access_iterator_tag iterator_category; }; -#endif template struct integer_range { -#ifdef BOOST_USE_ITERATOR_ADAPTORS typedef iterator_adaptor, IntegerType> iterator; -#else - typedef int_iterator iterator; -#endif + typedef iterator const_iterator; typedef IntegerType value_type; typedef std::ptrdiff_t difference_type; @@ -79,8 +66,4 @@ protected: } // namespace boost -#ifndef BOOST_MSVC -#undef BOOST_USE_ITERATOR_ADAPTORS -#endif - #endif // BOOST_INTEGER_RANGE_HPP_