mirror of
https://github.com/boostorg/utility.git
synced 2025-05-09 15:04:00 +00:00
adjusted to changes in iterator_adaptors.hpp, added more
tests of make_xxx [SVN r9051]
This commit is contained in:
parent
155457e2b5
commit
456dfd0dea
@ -246,14 +246,10 @@ main()
|
|||||||
boost::random_access_iterator_test(i, N, array);
|
boost::random_access_iterator_test(i, N, array);
|
||||||
|
|
||||||
typedef boost::iterator<std::random_access_iterator_tag, dummyT> InnerTraits;
|
typedef boost::iterator<std::random_access_iterator_tag, dummyT> InnerTraits;
|
||||||
#if 0
|
boost::random_access_iterator_test(boost::make_indirect_iterator(ptr, InnerTraits()), N, array);
|
||||||
boost::random_access_iterator_test(boost::make_indirect_iterator<InnerTraits>(&*ptr), N, array);
|
|
||||||
#else
|
|
||||||
boost::random_access_iterator_test(boost::make_indirect_iterator<InnerTraits, dummyT**>(&*ptr), N, array);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef BOOST_NO_STD_ITERATOR_TRAITS
|
#ifndef BOOST_NO_STD_ITERATOR_TRAITS
|
||||||
boost::random_access_iterator_test(boost::make_indirect_iterator(&*ptr), N, array);
|
boost::random_access_iterator_test(boost::make_indirect_iterator(ptr), N, array);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const_indirect_iterator j = ptr;
|
const_indirect_iterator j = ptr;
|
||||||
@ -261,11 +257,8 @@ main()
|
|||||||
|
|
||||||
dummyT*const* const_ptr = ptr;
|
dummyT*const* const_ptr = ptr;
|
||||||
typedef boost::iterator<std::random_access_iterator_tag,dummyT,std::ptrdiff_t,const dummyT*,const dummyT&> ConstInnerTraits;
|
typedef boost::iterator<std::random_access_iterator_tag,dummyT,std::ptrdiff_t,const dummyT*,const dummyT&> ConstInnerTraits;
|
||||||
#if 0
|
|
||||||
boost::random_access_iterator_test(boost::make_indirect_iterator<ConstInnerTraits>(const_ptr), N, array);
|
boost::random_access_iterator_test(boost::make_indirect_iterator(const_ptr, ConstInnerTraits()), N, array);
|
||||||
#else
|
|
||||||
boost::random_access_iterator_test(boost::make_indirect_iterator<ConstInnerTraits,dummyT*const*>(const_ptr), N, array);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef BOOST_NO_STD_ITERATOR_TRAITS
|
#ifndef BOOST_NO_STD_ITERATOR_TRAITS
|
||||||
boost::random_access_iterator_test(boost::make_indirect_iterator(const_ptr), N, array);
|
boost::random_access_iterator_test(boost::make_indirect_iterator(const_ptr), N, array);
|
||||||
@ -380,12 +373,22 @@ main()
|
|||||||
FilterIter i(array, FilterPolicies(one_or_four(), array + N));
|
FilterIter i(array, FilterPolicies(one_or_four(), array + N));
|
||||||
boost::forward_iterator_test(i, dummyT(1), dummyT(4));
|
boost::forward_iterator_test(i, dummyT(1), dummyT(4));
|
||||||
|
|
||||||
|
typedef boost::iterator<std::forward_iterator_tag, dummyT, std::ptrdiff_t, dummyT*, dummyT&> FilterTraits;
|
||||||
|
boost::forward_iterator_test(boost::make_filter_iterator<FilterTraits>
|
||||||
|
(array, array + N, one_or_four() ), dummyT(1), dummyT(4));
|
||||||
|
|
||||||
|
boost::forward_iterator_test(boost::make_filter_iterator<FilterTraits, one_or_four>
|
||||||
|
(array, array + N), dummyT(1), dummyT(4));
|
||||||
|
|
||||||
|
#ifndef BOOST_NO_STD_ITERATOR_TRAITS
|
||||||
boost::forward_iterator_test(boost::make_filter_iterator(
|
boost::forward_iterator_test(boost::make_filter_iterator(
|
||||||
array, array + N, one_or_four()
|
array, array + N, one_or_four()), dummyT(1), dummyT(4));
|
||||||
#ifdef BOOST_NO_STD_ITERATOR_TRAITS
|
|
||||||
, boost::iterator<std::forward_iterator_tag, dummyT, std::ptrdiff_t, dummyT*, dummyT&>()
|
boost::forward_iterator_test(boost::make_filter_iterator<one_or_four>(
|
||||||
|
array, array + N), dummyT(1), dummyT(4));
|
||||||
#endif
|
#endif
|
||||||
), dummyT(1), dummyT(4));
|
|
||||||
|
|
||||||
}
|
}
|
||||||
std::cout << "test successful " << std::endl;
|
std::cout << "test successful " << std::endl;
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user