From 443dfb990143a8cb6d9f508eebea5bb6bdf805ee Mon Sep 17 00:00:00 2001 From: Marcel Raad Date: Fri, 18 Sep 2015 10:15:11 +0200 Subject: [PATCH] Fix test compilation boost/iterator.hpp was implicitly dragged in via boost/operators.hpp, from which it was removed in https://github.com/boostorg/utility/commit/cb6500161b682a66438604e75ab901c46e42430d. It's not needed anyway, all it does is map boost::iterator to std::iterator. --- test/concept_tests.cpp | 7 +++++-- test/indirect_iterator_test.cpp | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/test/concept_tests.cpp b/test/concept_tests.cpp index f3d518a..f89cd54 100644 --- a/test/concept_tests.cpp +++ b/test/concept_tests.cpp @@ -7,13 +7,16 @@ #include #include +#include +#include + struct new_random_access : std::random_access_iterator_tag , boost::random_access_traversal_tag {}; struct new_iterator - : public boost::iterator< new_random_access, int > + : public std::iterator< new_random_access, int > { int& operator*() const { return *m_x; } new_iterator& operator++() { return *this; } @@ -33,7 +36,7 @@ struct new_iterator new_iterator operator+(std::ptrdiff_t, new_iterator x) { return x; } struct old_iterator - : public boost::iterator + : public std::iterator { int& operator*() const { return *m_x; } old_iterator& operator++() { return *this; } diff --git a/test/indirect_iterator_test.cpp b/test/indirect_iterator_test.cpp index c689673..7250651 100644 --- a/test/indirect_iterator_test.cpp +++ b/test/indirect_iterator_test.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #if !defined(__SGI_STL_PORT) \ && (defined(BOOST_MSVC_STD_ITERATOR) \ @@ -164,7 +165,7 @@ main() BOOST_STATIC_ASSERT( has_element_type< - boost::detail::iterator_traits::value_type + std::iterator_traits::value_type >::value );