boostorg/iterator
1
0
Fork 1
mirror of https://github.com/boostorg/iterator.git synced 2025-07-29 20:37:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19 from MarcelRaad/patch-1

Browse Source 
Fix test compilation
This commit is contained in:
Edward Diener
2015-09-22 18:03:05 -07:00
parent c734f3bfa3 443dfb9901
commit 711a0232f8
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/concept_tests.cpp
View File

@ -7,13 +7,16 @@
#include <boost/iterator/iterator_categories.hpp>
#include <boost/operators.hpp>
#include <iterator>
#include <cstddef>
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<std::random_access_iterator_tag, int>
: public std::iterator<std::random_access_iterator_tag, int>
{
int& operator*() const { return *m_x; }
old_iterator& operator++() { return *this; }

3
test/indirect_iterator_test.cpp
View File

@ -32,6 +32,7 @@
#include <vector>
#include <stdlib.h>
#include <set>
#include <iterator>
#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<shared_t::iterator>::value_type
std::iterator_traits<shared_t::iterator>::value_type
>::value
);