Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r61024 - trunk/boost/range/adaptor
From: neil_at_[hidden]
Date: 2010-04-03 15:28:04


Author: neilgroves
Date: 2010-04-03 15:28:03 EDT (Sat, 03 Apr 2010)
New Revision: 61024
URL: http://svn.boost.org/trac/boost/changeset/61024

Log:
Boost.Range correct the adjacent_filtered adaptor to be resilient accident argument dependent lookup of boost::next
Text files modified:
   trunk/boost/range/adaptor/adjacent_filtered.hpp | 6 +++---
   1 files changed, 3 insertions(+), 3 deletions(-)

Modified: trunk/boost/range/adaptor/adjacent_filtered.hpp
==============================================================================
--- trunk/boost/range/adaptor/adjacent_filtered.hpp (original)
+++ trunk/boost/range/adaptor/adjacent_filtered.hpp 2010-04-03 15:28:03 EDT (Sat, 03 Apr 2010)
@@ -116,7 +116,7 @@
                                 {
                                         if (default_pass)
                                         {
- raw_iterator nxt = next(it);
+ raw_iterator nxt = ::boost::next(it);
                                                 while (nxt != last && !bi_pred(*it, *nxt))
                                                 {
                                                         ++it;
@@ -125,7 +125,7 @@
                                         }
                                         else
                                         {
- raw_iterator nxt = next(it);
+ raw_iterator nxt = ::boost::next(it);
                                                 for(; nxt != last; ++it, ++nxt)
                                                 {
                                                         if (bi_pred(*it, *nxt))
@@ -155,7 +155,7 @@
                         {
                                 BOOST_ASSERT( current != this->end().base() );
 
- current = to_valid(next(current), this->end().base(), m_bi_pred, m_default_pass);
+ current = to_valid(::boost::next(current), this->end().base(), m_bi_pred, m_default_pass);
                         }
 
                 private:


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk