Fix test compilation

boost/iterator.hpp was implicitly dragged in via boost/operators.hpp, from which it was removed in cb6500161b. It's not needed anyway, all it does is map boost::iterator to std::iterator.
This commit is contained in:
Marcel Raad
2015-09-18 10:15:11 +02:00
committed by Marcel Raad
parent c734f3bfa3
commit 443dfb9901
2 changed files with 7 additions and 3 deletions

View File

@ -7,13 +7,16 @@
#include <boost/iterator/iterator_categories.hpp> #include <boost/iterator/iterator_categories.hpp>
#include <boost/operators.hpp> #include <boost/operators.hpp>
#include <iterator>
#include <cstddef>
struct new_random_access struct new_random_access
: std::random_access_iterator_tag : std::random_access_iterator_tag
, boost::random_access_traversal_tag , boost::random_access_traversal_tag
{}; {};
struct new_iterator struct new_iterator
: public boost::iterator< new_random_access, int > : public std::iterator< new_random_access, int >
{ {
int& operator*() const { return *m_x; } int& operator*() const { return *m_x; }
new_iterator& operator++() { return *this; } new_iterator& operator++() { return *this; }
@ -33,7 +36,7 @@ struct new_iterator
new_iterator operator+(std::ptrdiff_t, new_iterator x) { return x; } new_iterator operator+(std::ptrdiff_t, new_iterator x) { return x; }
struct old_iterator struct old_iterator
: public boost::iterator<std::random_access_iterator_tag, int> : public std::iterator<std::random_access_iterator_tag, int>
{ {
int& operator*() const { return *m_x; } int& operator*() const { return *m_x; }
old_iterator& operator++() { return *this; } old_iterator& operator++() { return *this; }

View File

@ -32,6 +32,7 @@
#include <vector> #include <vector>
#include <stdlib.h> #include <stdlib.h>
#include <set> #include <set>
#include <iterator>
#if !defined(__SGI_STL_PORT) \ #if !defined(__SGI_STL_PORT) \
&& (defined(BOOST_MSVC_STD_ITERATOR) \ && (defined(BOOST_MSVC_STD_ITERATOR) \
@ -164,7 +165,7 @@ main()
BOOST_STATIC_ASSERT( BOOST_STATIC_ASSERT(
has_element_type< has_element_type<
boost::detail::iterator_traits<shared_t::iterator>::value_type std::iterator_traits<shared_t::iterator>::value_type
>::value >::value
); );