mirror of
https://github.com/boostorg/iterator.git
synced 2025-05-12 14:01:37 +00:00
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]
This commit is contained in:
parent
c583cf8730
commit
50c9214b82
@ -13,22 +13,13 @@
|
|||||||
#ifndef BOOST_INTEGER_RANGE_HPP_
|
#ifndef BOOST_INTEGER_RANGE_HPP_
|
||||||
#define 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 <boost/pending/iterator_adaptors.hpp>
|
#include <boost/pending/iterator_adaptors.hpp>
|
||||||
#else
|
|
||||||
#include <boost/pending/detail/int_iterator.hpp>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace boost {
|
namespace boost {
|
||||||
|
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
// Counting Iterator and Integer Range Class
|
// Counting Iterator and Integer Range Class
|
||||||
|
|
||||||
#ifdef BOOST_USE_ITERATOR_ADAPTORS
|
|
||||||
struct counting_iterator_policies : public default_iterator_policies
|
struct counting_iterator_policies : public default_iterator_policies
|
||||||
{
|
{
|
||||||
template <class IntegerType>
|
template <class IntegerType>
|
||||||
@ -43,16 +34,12 @@ struct counting_iterator_traits {
|
|||||||
typedef std::ptrdiff_t difference_type;
|
typedef std::ptrdiff_t difference_type;
|
||||||
typedef std::random_access_iterator_tag iterator_category;
|
typedef std::random_access_iterator_tag iterator_category;
|
||||||
};
|
};
|
||||||
#endif
|
|
||||||
|
|
||||||
template <class IntegerType>
|
template <class IntegerType>
|
||||||
struct integer_range {
|
struct integer_range {
|
||||||
#ifdef BOOST_USE_ITERATOR_ADAPTORS
|
|
||||||
typedef iterator_adaptor<IntegerType, counting_iterator_policies,
|
typedef iterator_adaptor<IntegerType, counting_iterator_policies,
|
||||||
counting_iterator_traits<IntegerType>, IntegerType> iterator;
|
counting_iterator_traits<IntegerType>, IntegerType> iterator;
|
||||||
#else
|
|
||||||
typedef int_iterator<IntegerType> iterator;
|
|
||||||
#endif
|
|
||||||
typedef iterator const_iterator;
|
typedef iterator const_iterator;
|
||||||
typedef IntegerType value_type;
|
typedef IntegerType value_type;
|
||||||
typedef std::ptrdiff_t difference_type;
|
typedef std::ptrdiff_t difference_type;
|
||||||
@ -79,8 +66,4 @@ protected:
|
|||||||
|
|
||||||
} // namespace boost
|
} // namespace boost
|
||||||
|
|
||||||
#ifndef BOOST_MSVC
|
|
||||||
#undef BOOST_USE_ITERATOR_ADAPTORS
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif // BOOST_INTEGER_RANGE_HPP_
|
#endif // BOOST_INTEGER_RANGE_HPP_
|
||||||
|
Loading…
x
Reference in New Issue
Block a user