feedc0de/boost_utility
1
0
Fork 0
forked from boostorg/utility
Code Pull Requests Activity

Use Jeremy's new make_reverse_iterator form; add more comprehensive

Browse Source 
testing. Force-decay array function arguments to pointers.


[SVN r9047]
This commit is contained in:
Dave Abrahams
2001-02-09 03:32:59 +00:00
parent c959cf7870
commit b5c91485bf
1 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
iterator_adaptor_test.cpp
View File

@@ -9,6 +9,9 @@
// See http://www.boost.org for most recent version including documentation. // See http://www.boost.org for most recent version including documentation.
// Revision History // Revision History
// 08 Feb 01 Use Jeremy's new make_reverse_iterator form; add more
// comprehensive testing. Force-decay array function arguments to
// pointers.
// 07 Feb 01 Added tests for the make_xxx_iterator() helper functions. // 07 Feb 01 Added tests for the make_xxx_iterator() helper functions.
// (Jeremy Siek) // (Jeremy Siek)
// 07 Feb 01 Replaced use of xxx_pair_generator with xxx_generator where // 07 Feb 01 Replaced use of xxx_pair_generator with xxx_generator where
@@ -247,9 +250,9 @@ main()
#ifdef BOOST_NO_STD_ITERATOR_TRAITS #ifdef BOOST_NO_STD_ITERATOR_TRAITS
typedef boost::iterator<std::random_access_iterator_tag, dummyT> InnerTraits; typedef boost::iterator<std::random_access_iterator_tag, dummyT> InnerTraits;
boost::random_access_iterator_test(boost::make_indirect_iterator(ptr, *ptr, InnerTraits()), N, array); boost::random_access_iterator_test(boost::make_indirect_iterator(&*ptr, *ptr, InnerTraits()), N, array);
#else #else
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;
@@ -309,7 +312,7 @@ main()
#ifdef BOOST_NO_STD_ITERATOR_TRAITS #ifdef BOOST_NO_STD_ITERATOR_TRAITS
typedef boost::iterator<std::random_access_iterator_tag,dummyT> ReverseTraits; typedef boost::iterator<std::random_access_iterator_tag,dummyT> ReverseTraits;
boost::random_access_iterator_test(boost::make_reverse_iterator(reversed + N, ReverseTraits()), N, array); boost::random_access_iterator_test(boost::make_reverse_iterator<ReverseTraits>(reversed + N), N, array);
#else #else
boost::random_access_iterator_test(boost::make_reverse_iterator(reversed + N), N, array); boost::random_access_iterator_test(boost::make_reverse_iterator(reversed + N), N, array);
#endif #endif
@@ -320,7 +323,7 @@ main()
const dummyT* const_reversed = reversed; const dummyT* const_reversed = reversed;
#ifdef BOOST_NO_STD_ITERATOR_TRAITS #ifdef BOOST_NO_STD_ITERATOR_TRAITS
typedef boost::iterator<std::random_access_iterator_tag,const dummyT> ConstReverseTraits; typedef boost::iterator<std::random_access_iterator_tag,const dummyT> ConstReverseTraits;
boost::random_access_iterator_test(boost::make_reverse_iterator(const_reversed + N, ConstReverseTraits()), N, array); boost::random_access_iterator_test(boost::make_reverse_iterator<ConstReverseTraits>(const_reversed + N), N, array);
#else #else
boost::random_access_iterator_test(boost::make_reverse_iterator(const_reversed + N), N, array); boost::random_access_iterator_test(boost::make_reverse_iterator(const_reversed + N), N, array);
#endif #endif
@@ -328,6 +331,33 @@ main()
boost::const_nonconst_iterator_test(i, ++j); boost::const_nonconst_iterator_test(i, ++j);
} }
// Test reverse_iterator_generator again, with traits fully deducible on most platforms
#if !defined(BOOST_MSVC) || defined(__SGI_STL_PORT)
{
std::deque<dummyT> reversed_container;
std::copy(array, array + N, std::back_inserter(reversed_container));
const std::deque<dummyT>::iterator reversed = reversed_container.begin();
std::reverse(reversed, reversed + N);
typedef boost::reverse_iterator_generator<
std::deque<dummyT>::iterator>::type reverse_iterator;
typedef boost::reverse_iterator_generator<
std::deque<dummyT>::const_iterator>::type const_reverse_iterator;
reverse_iterator i = reversed + N;
boost::random_access_iterator_test(i, N, array);
boost::random_access_iterator_test(boost::make_reverse_iterator(reversed + N), N, array);
const_reverse_iterator j = reversed + N;
boost::random_access_iterator_test(j, N, array);
const std::deque<dummyT>::const_iterator const_reversed = reversed;
boost::random_access_iterator_test(boost::make_reverse_iterator(const_reversed + N), N, array);
boost::const_nonconst_iterator_test(i, ++j);
}
#endif
// Test integer_range's iterators // Test integer_range's iterators
{ {
int int_array[] = { 0, 1, 2, 3, 4, 5 }; int int_array[] = { 0, 1, 2, 3, 4, 5 };