Subject: [Boost-commit] svn:boost r63935 - trunk/libs/range/test/adaptor_test
From: neil_at_[hidden]
Date: 2010-07-12 17:52:29
Author: neilgroves
Date: 2010-07-12 17:52:28 EDT (Mon, 12 Jul 2010)
New Revision: 63935
URL: http://svn.boost.org/trac/boost/changeset/63935
Log:
[range] - fix erroneous change to uniqued test case.
Text files modified:
trunk/libs/range/test/adaptor_test/uniqued.cpp | 110 ----------------------------------------
1 files changed, 0 insertions(+), 110 deletions(-)
Modified: trunk/libs/range/test/adaptor_test/uniqued.cpp
==============================================================================
--- trunk/libs/range/test/adaptor_test/uniqued.cpp (original)
+++ trunk/libs/range/test/adaptor_test/uniqued.cpp 2010-07-12 17:52:28 EDT (Mon, 12 Jul 2010)
@@ -15,129 +15,19 @@
#include <boost/assign.hpp>
#include <boost/range/algorithm_ext.hpp>
-#include <boost/range/sub_range.hpp>
#include <algorithm>
#include <list>
#include <set>
#include <vector>
-#include <functional>
namespace boost
{
- namespace range3
- {
- namespace concept
- {
- template<class Range>
- class PopFrontSubRange
- {
- public:
- void constraints()
- {
- Range copied_range(*m_range);
- BOOST_DEDUCED_TYPENAME range_value<Range>::type v = copied_range.front();
- copied_range.pop_front();
- }
- private:
- Range* m_range;
- };
-
- template<class Range>
- class PopBackSubRange
- {
- public:
- void constraints()
- {
- Range copied_range(*m_range);
- BOOST_DEDUCED_TYPENAME range_value<Range>::type v = copied_range.back();
- copied_range.pop_back();
- }
- private:
- Range* m_range;
- };
- } // namespace concept
- namespace adaptor
- {
- template<class Range, class Pred>
- class adjacent_filter_adaptor
- : private boost::sub_range<Range>
- , private Pred
- {
- public:
- typedef boost::sub_range<Range> range_t;
- typedef Pred pred_t;
- typedef typename range_t::value_type value_type;
- using range_t::reference;
- using range_t::const_reference;
- using range_t::empty;
- using range_t::front;
- using range_t::back;
-
- adjacent_filter_adaptor(Range& rng, Pred pred)
- : range_t(rng)
- , pred_t(pred)
- {
- }
-
- void pop_front()
- {
- BOOST_ASSERT( !empty() );
- const value_type& old_front = front();
- range_t::pop_front();
- while (!empty() && !pred_t::operator()(front(), old_front))
- range_t::pop_front();
- }
-
- void pop_back()
- {
- BOOST_ASSERT( !empty() );
- const value_type& old_back = back();
- range_t::pop_back();
- while (!empty() && !pred_t::operator()(old_back, back()))
- range_t::pop_back();
- }
- };
-
- template<class Range>
- class unique_adaptor
- : public adjacent_filter_adaptor<Range, std::not_equal_to< typename range_value<Range>::type > >
- {
- typedef adjacent_filter_adaptor<Range, std::not_equal_to< typename range_value<Range>::type > > base_t;
- public:
- typedef std::not_equal_to< typename range_value<Range>::type > pred_t;
- explicit unique_adaptor(Range& rng) : base_t(rng, pred_t()) {}
- };
- }
- }
-
namespace
{
template< class Container >
- void new_uniqued_adaptor_test(Container& c)
- {
- std::vector<int> test_result1;
- boost::range3::adaptor::unique_adaptor<Container> rng(c);
- while (!rng.empty())
- {
- test_result1.push_back(rng.front());
- rng.pop_front();
- }
-
- std::vector<int> test_result2;
- boost::push_back(test_result2, adaptors::unique(c));
-
- BOOST_CHECK_EQUAL_COLLECTIONS(
- test_result1.begin(), test_result1.end(),
- test_result2.begin(), test_result2.end()
- );
- }
-
- template< class Container >
void uniqued_test_impl( Container& c )
{
- new_uniqued_adaptor_test(c);
-
using namespace boost::adaptors;
std::vector< int > test_result1;