feedc0de/boost_iterator
1
0
Fork 0
forked from boostorg/iterator
Code Pull Requests Activity

Revert changes that were merged to master.

Browse Source 
Reverted: 2e099caceb9..21102938e8ccb

I'm going to reapply some of them soon, but it's easier to revert them
all first, as there are conflicts. Also the number of changes that were
inserted since then, mean that there would be a huge gap between related
changes.
This commit is contained in:
Daniel James
2014-06-06 00:56:20 +01:00
parent c142956936
commit 8e5b8025d8
23 changed files with 417 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
include/boost/iterator/iterator_traits.hpp
View File

@ -10,8 +10,18 @@
namespace boost {
// Obsolete. Remove.
#define BOOST_ITERATOR_CATEGORY iterator_category
// Unfortunately, g++ 2.95.x chokes when we define a class template
// iterator_category which has the same name as its
// std::iterator_category() function, probably due in part to the
// "std:: is visible globally" hack it uses. Use
// BOOST_ITERATOR_CATEGORY to write code that's portable to older
// GCCs.
# if BOOST_WORKAROUND(__GNUC__, <= 2)
# define BOOST_ITERATOR_CATEGORY iterator_category_
# else
# define BOOST_ITERATOR_CATEGORY iterator_category
# endif
template <class Iterator>
@ -40,11 +50,43 @@ struct iterator_difference
};
template <class Iterator>
struct iterator_category
struct BOOST_ITERATOR_CATEGORY
{
typedef typename boost::detail::iterator_traits<Iterator>::iterator_category type;
};
# if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
template <>
struct iterator_value<int>
{
typedef void type;
};
template <>
struct iterator_reference<int>
{
typedef void type;
};
template <>
struct iterator_pointer<int>
{
typedef void type;
};
template <>
struct iterator_difference<int>
{
typedef void type;
};
template <>
struct BOOST_ITERATOR_CATEGORY<int>
{
typedef void type;
};
# endif
} // namespace boost::iterator
#endif // ITERATOR_TRAITS_DWA200347_HPP