Subject: [Boost-commit] svn:boost r61404 - in trunk: boost/range/adaptor libs/range/test libs/range/test/adaptor_test
From: neil_at_[hidden]
Date: 2010-04-19 07:45:28
Author: neilgroves
Date: 2010-04-19 07:45:27 EDT (Mon, 19 Apr 2010)
New Revision: 61404
URL: http://svn.boost.org/trac/boost/changeset/61404
Log:
Boost.Range - removed unnecessary code from the sliced adaptor.
Added a unit test to test the use of a non-member function as a transform functor and composition of strided, sliced and transformed range adaptors.
Added:
trunk/libs/range/test/adaptor_test/strided2.cpp (contents, props changed)
Text files modified:
trunk/boost/range/adaptor/sliced.hpp | 19 -------------------
trunk/libs/range/test/Jamfile.v2 | 1 +
2 files changed, 1 insertions(+), 19 deletions(-)
Modified: trunk/boost/range/adaptor/sliced.hpp
==============================================================================
--- trunk/boost/range/adaptor/sliced.hpp (original)
+++ trunk/boost/range/adaptor/sliced.hpp 2010-04-19 07:45:27 EDT (Mon, 19 Apr 2010)
@@ -39,17 +39,6 @@
}
template< class RandomAccessRange >
- inline iterator_range< BOOST_DEDUCED_TYPENAME range_iterator<const RandomAccessRange>::type >
- slice( const RandomAccessRange& rng, std::size_t t, std::size_t u )
- {
- BOOST_ASSERT( t <= u && "error in slice indices" );
- BOOST_ASSERT( static_cast<std::size_t>(boost::size(rng)) >= u &&
- "second slice index out of bounds" );
-
- return boost::make_iterator_range( rng, t, u - boost::size(rng) );
- }
-
- template< class RandomAccessRange >
inline iterator_range<
BOOST_DEDUCED_TYPENAME range_iterator<RandomAccessRange>::type >
operator|( RandomAccessRange& r, const sliced& f )
@@ -57,14 +46,6 @@
return adaptors::slice( r, f.t, f.u );
}
- template< class RandomAccessRange >
- inline iterator_range<
- BOOST_DEDUCED_TYPENAME range_iterator<const RandomAccessRange>::type >
- operator|( const RandomAccessRange& r, const sliced& f )
- {
- return adaptors::slice( r, f.t, f.u );
- }
-
} // namespace adaptors
} // namespace boost
Modified: trunk/libs/range/test/Jamfile.v2
==============================================================================
--- trunk/libs/range/test/Jamfile.v2 (original)
+++ trunk/libs/range/test/Jamfile.v2 2010-04-19 07:45:27 EDT (Mon, 19 Apr 2010)
@@ -42,6 +42,7 @@
[ range-test adaptor_test/reversed ]
[ range-test adaptor_test/sliced ]
[ range-test adaptor_test/strided ]
+ [ range-test adaptor_test/strided2 ]
[ range-test adaptor_test/tokenized ]
[ range-test adaptor_test/transformed ]
[ range-test adaptor_test/uniqued ]
Added: trunk/libs/range/test/adaptor_test/strided2.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/range/test/adaptor_test/strided2.cpp 2010-04-19 07:45:27 EDT (Mon, 19 Apr 2010)
@@ -0,0 +1,67 @@
+// Boost.Range library
+//
+// Copyright Neil Groves 2010. Use, modification and
+// distribution is subject to the Boost Software License, Version
+// 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+//
+//
+// For more information, see http://www.boost.org/libs/range/
+//
+
+// This test was added due to a report that the Range Adaptors:
+// 1. Caused havoc when using namespace boost::adaptors was used
+// 2. Did not work with non-member functions
+// 3. The strided adaptor could not be composed with sliced
+//
+// None of these issues could be reproduced on GCC 4.4, but this
+// work makes for useful additional test coverage since this
+// uses chaining of adaptors and non-member functions whereas
+// most of the tests avoid this use case.
+
+#include <boost/range/adaptor/strided.hpp>
+#include <boost/range/adaptor/sliced.hpp>
+#include <boost/range/adaptor/transformed.hpp>
+#include <boost/range/irange.hpp>
+
+#include <boost/test/test_tools.hpp>
+#include <boost/test/unit_test.hpp>
+
+#include <boost/assign.hpp>
+#include <boost/range/algorithm_ext.hpp>
+
+#include <algorithm>
+#include <vector>
+
+namespace boost
+{
+ namespace
+ {
+ int times_two(int x) { return x * 2; }
+
+ void strided_test2()
+ {
+ using namespace boost::adaptors;
+ using namespace boost::assign;
+ std::vector<int> v;
+ boost::push_back(v, boost::irange(0,10));
+ std::vector<int> z;
+ boost::push_back(z, v | sliced(2,6) | strided(2) | transformed(×_two));
+ std::vector<int> reference;
+ reference += 4,8;
+ BOOST_CHECK_EQUAL_COLLECTIONS( reference.begin(), reference.end(),
+ z.begin(), z.end() );
+ }
+ }
+}
+
+boost::unit_test::test_suite*
+init_unit_test_suite(int argc, char* argv[])
+{
+ boost::unit_test::test_suite* test
+ = BOOST_TEST_SUITE( "RangeTestSuite.adaptor.strided2" );
+
+ test->add( BOOST_TEST_CASE( &boost::strided_test2 ) );
+
+ return test;
+}