feedc0de/boost_algorithm
1
0
Fork 0
forked from boostorg/algorithm
Code Pull Requests Activity

Merge bug fix to release; Fixes #7989

Browse Source 
[SVN r83193]
This commit is contained in:
Marshall Clow
2013-02-27 23:37:21 +00:00
parent 40b5941652
commit 2381d0bdac
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/algorithm/string/find_iterator.hpp
View File

@ -134,8 +134,10 @@ namespace boost {
{ {
if(m_Match.begin() == m_Match.end()) if(m_Match.begin() == m_Match.end())
m_Match=this->do_find(m_Match.end(),m_End); m_Match=this->do_find(m_Match.end(),m_End);
else else {
m_Match=this->do_find(m_Match.begin()+1,m_End); input_iterator_type last = m_Match.begin();
m_Match=this->do_find(++last,m_End);
}
} }
// comparison // comparison

2
string/test/split_test.cpp
View File

@ -181,12 +181,10 @@ void iterator_test()
BOOST_CHECK(siter==split_iterator<string::iterator>(siter)); BOOST_CHECK(siter==split_iterator<string::iterator>(siter));
BOOST_CHECK(siter==split_iterator<string::iterator>()); BOOST_CHECK(siter==split_iterator<string::iterator>());
#if 0
// Make sure we work with forward iterators // Make sure we work with forward iterators
// See bug #7989 // See bug #7989
list<char> l1; list<char> l1;
find_iterator<list<char>::iterator> liter=make_find_iterator(l1, first_finder("xx")); find_iterator<list<char>::iterator> liter=make_find_iterator(l1, first_finder("xx"));
#endif
} }
BOOST_AUTO_TEST_CASE( test_main ) BOOST_AUTO_TEST_CASE( test_main )