feedc0de/boost_range
1
0
Fork 0
forked from boostorg/range
Code Pull Requests Activity

trac 9515 - fix for uniqued adaptor consistent with unique algorithm.

Browse Source
This commit is contained in:
Neil Groves
2014-03-03 01:24:56 +00:00
parent d87e1f3ade
commit 17c0fa271c
2 changed files with 103 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
include/boost/range/adaptor/adjacent_filtered.hpp
View File

@ -62,54 +62,44 @@ namespace boost
, pred_t(pred)
, m_last(last)
{
move_to_next_valid();
}
template<class OtherIter>
skip_iterator( const skip_iterator<OtherIter, pred_t, default_pass>& other )
: base_t(other.base())
, pred_t(other)
, m_last(other.m_last) {}
void move_to_next_valid()
, m_last(other.m_last)
{
iter_t& it = this->base_reference();
pred_t& bi_pred = *this;
if (it != m_last)
{
if (default_pass)
{
iter_t nxt = ::boost::next(it);
while (nxt != m_last && !bi_pred(*it, *nxt))
{
++it;
++nxt;
}
}
else
{
iter_t nxt = ::boost::next(it);
for(; nxt != m_last; ++it, ++nxt)
{
if (bi_pred(*it, *nxt))
{
break;
}
}
if (nxt == m_last)
{
it = m_last;
}
}
}
}
void increment()
{
iter_t& it = this->base_reference();
BOOST_ASSERT( it != m_last );
pred_t& bi_pred = *this;
iter_t prev = it;
++it;
move_to_next_valid();
if (it != m_last)
{
if (default_pass)
{
while (it != m_last && !bi_pred(*prev, *it))
{
++it;
++prev;
}
}
else
{
for (; it != m_last; ++it, ++prev)
{
if (bi_pred(*prev, *it))
{
break;
}
}
}
}
}
iter_t m_last;