From 2f72016049227c6107c19cbe418aadb37111e7a4 Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Thu, 15 Oct 2015 23:53:37 -0400 Subject: [PATCH] Revert "Fix test compilation" This reverts commit 443dfb990143a8cb6d9f508eebea5bb6bdf805ee. --- test/concept_tests.cpp | 7 ++----- test/indirect_iterator_test.cpp | 3 +-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/test/concept_tests.cpp b/test/concept_tests.cpp index f89cd54..f3d518a 100644 --- a/test/concept_tests.cpp +++ b/test/concept_tests.cpp @@ -7,16 +7,13 @@ #include #include -#include -#include - struct new_random_access : std::random_access_iterator_tag , boost::random_access_traversal_tag {}; struct new_iterator - : public std::iterator< new_random_access, int > + : public boost::iterator< new_random_access, int > { int& operator*() const { return *m_x; } new_iterator& operator++() { return *this; } @@ -36,7 +33,7 @@ struct new_iterator new_iterator operator+(std::ptrdiff_t, new_iterator x) { return x; } struct old_iterator - : public std::iterator + : public boost::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 7250651..c689673 100644 --- a/test/indirect_iterator_test.cpp +++ b/test/indirect_iterator_test.cpp @@ -32,7 +32,6 @@ #include #include #include -#include #if !defined(__SGI_STL_PORT) \ && (defined(BOOST_MSVC_STD_ITERATOR) \ @@ -165,7 +164,7 @@ main() BOOST_STATIC_ASSERT( has_element_type< - std::iterator_traits::value_type + boost::detail::iterator_traits::value_type >::value );