trac 8676 sliced adaptor fixed.

This commit is contained in:
Neil Groves
2014-03-03 00:10:08 +00:00
parent 8b60f2c768
commit 63acc5c633
4 changed files with 59 additions and 4 deletions

View File

@ -34,7 +34,8 @@ namespace boost
public:
template<typename Rng, typename T, typename U>
sliced_range(Rng& rng, T t, U u)
: base_t(boost::make_iterator_range(rng, t, u - boost::size(rng)))
: base_t(boost::next(boost::begin(rng), t),
boost::next(boost::begin(rng), u))
{
}
};

View File

@ -708,7 +708,6 @@ public:
BOOST_DEDUCED_TYPENAME range_difference<Range>::type advance_begin,
BOOST_DEDUCED_TYPENAME range_difference<Range>::type advance_end )
{
//BOOST_ASSERT( advance_begin - advance_end <= size(r) && "creating invalid range" );
return iterator_range_detail::make_range_impl( r, advance_begin, advance_end );
}
@ -720,7 +719,6 @@ public:
BOOST_DEDUCED_TYPENAME range_difference<Range>::type advance_begin,
BOOST_DEDUCED_TYPENAME range_difference<Range>::type advance_end )
{
//BOOST_ASSERT( advance_begin - advance_end <= size(r) && "creating invalid range" );
return iterator_range_detail::make_range_impl( r, advance_begin, advance_end );
}
@ -730,7 +728,6 @@ public:
BOOST_DEDUCED_TYPENAME range_difference<Range>::type advance_begin,
BOOST_DEDUCED_TYPENAME range_difference<Range>::type advance_end )
{
//BOOST_ASSERT( advance_begin - advance_end <= size(r) && "creating invalid range" );
return iterator_range_detail::make_range_impl( r, advance_begin, advance_end );
}

View File

@ -44,6 +44,7 @@ test-suite range :
[ range-test adaptor_test/sliced ]
[ range-test adaptor_test/strided ]
[ range-test adaptor_test/strided2 ]
[ range-test adaptor_test/ticket_8676_sliced_transformed ]
[ range-test adaptor_test/ticket_9519_strided_reversed ]
[ range-test adaptor_test/tokenized ]
[ range-test adaptor_test/transformed ]

View File

@ -0,0 +1,56 @@
// Boost.Range library
//
// Copyright Neil Groves 2014. 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/
//
#include <boost/range/adaptor/sliced.hpp>
#include <boost/range/adaptor/transformed.hpp>
#include <boost/range/algorithm_ext/push_back.hpp>
#include <boost/test/test_tools.hpp>
#include <boost/test/unit_test.hpp>
#include <vector>
namespace
{
struct identity
{
typedef int result_type;
result_type operator()(int i) const { return i; }
};
void sliced_and_transformed()
{
using namespace boost::adaptors;
std::vector<int> input;
for (int i = 0; i < 10; ++i)
input.push_back(i);
std::vector<int> out1;
boost::push_back(out1, input | sliced(2, 8)
| transformed(identity()));
std::vector<int> out2;
boost::push_back(out2, input | transformed(identity())
| sliced(2, 8));
BOOST_CHECK_EQUAL_COLLECTIONS(out1.begin(), out1.end(),
out2.begin(), out2.end());
}
} // anonymous namespace
boost::unit_test::test_suite*
init_unit_test_suite(int argc, char* argv[])
{
boost::unit_test::test_suite* test
= BOOST_TEST_SUITE( "Range adaptors - sliced and transformed" );
test->add(BOOST_TEST_CASE(&sliced_and_transformed));
return test;
}