Subject: [Boost-commit] svn:boost r83193 - in branches/release: boost/algorithm/string libs/algorithm/string/test
From: marshall_at_[hidden]
Date: 2013-02-27 18:37:22
Author: marshall
Date: 2013-02-27 18:37:21 EST (Wed, 27 Feb 2013)
New Revision: 83193
URL: http://svn.boost.org/trac/boost/changeset/83193
Log:
Merge bug fix to release; Fixes #7989
Properties modified:
branches/release/boost/algorithm/string/find_iterator.hpp (contents, props changed)
branches/release/libs/algorithm/string/test/split_test.cpp (contents, props changed)
Text files modified:
branches/release/boost/algorithm/string/find_iterator.hpp | 6 ++++--
branches/release/libs/algorithm/string/test/split_test.cpp | 2 --
2 files changed, 4 insertions(+), 4 deletions(-)
Modified: branches/release/boost/algorithm/string/find_iterator.hpp
==============================================================================
--- branches/release/boost/algorithm/string/find_iterator.hpp (original)
+++ branches/release/boost/algorithm/string/find_iterator.hpp 2013-02-27 18:37:21 EST (Wed, 27 Feb 2013)
@@ -134,8 +134,10 @@
{
if(m_Match.begin() == m_Match.end())
m_Match=this->do_find(m_Match.end(),m_End);
- else
- m_Match=this->do_find(m_Match.begin()+1,m_End);
+ else {
+ input_iterator_type last = m_Match.begin();
+ m_Match=this->do_find(++last,m_End);
+ }
}
// comparison
Modified: branches/release/libs/algorithm/string/test/split_test.cpp
==============================================================================
--- branches/release/libs/algorithm/string/test/split_test.cpp (original)
+++ branches/release/libs/algorithm/string/test/split_test.cpp 2013-02-27 18:37:21 EST (Wed, 27 Feb 2013)
@@ -181,12 +181,10 @@
BOOST_CHECK(siter==split_iterator<string::iterator>(siter));
BOOST_CHECK(siter==split_iterator<string::iterator>());
-#if 0
// Make sure we work with forward iterators
// See bug #7989
list<char> l1;
find_iterator<list<char>::iterator> liter=make_find_iterator(l1, first_finder("xx"));
-#endif
}
BOOST_AUTO_TEST_CASE( test_main )