boostorg/algorithm
1
0
Fork 1
mirror of https://github.com/boostorg/algorithm.git synced 2025-07-05 16:56:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Assign the iterator returned by std::copy back to Output, so that string algorithms will work with iterators other than inserters

Browse Source 
[SVN r62694]
This commit is contained in:
Steven Watanabe
2010-06-09 21:12:06 +00:00
parent 6289ed7f98
commit 46ed1bf987
4 changed files with 118 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/algorithm/string/detail/find_format.hpp
View File

@ -49,17 +49,17 @@ namespace boost {
if ( !M )
{
// Match not found - return original sequence
std::copy( ::boost::begin(Input), ::boost::end(Input), Output );
Output = std::copy( ::boost::begin(Input), ::boost::end(Input), Output );
return Output;
}
// Copy the beginning of the sequence
std::copy( ::boost::begin(Input), ::boost::begin(M), Output );
Output = std::copy( ::boost::begin(Input), ::boost::begin(M), Output );
// Format find result
// Copy formated result
std::copy( ::boost::begin(M.format_result()), ::boost::end(M.format_result()), Output );
Output = std::copy( ::boost::begin(M.format_result()), ::boost::end(M.format_result()), Output );
// Copy the rest of the sequence
std::copy( M.end(), ::boost::end(Input), Output );
Output = std::copy( M.end(), ::boost::end(Input), Output );
return Output;
}

6
include/boost/algorithm/string/detail/find_format_all.hpp
View File

@ -57,9 +57,9 @@ namespace boost {
while( M )
{
// Copy the beginning of the sequence
std::copy( LastMatch, M.begin(), Output );
Output = std::copy( LastMatch, M.begin(), Output );
// Copy formated result
std::copy( ::boost::begin(M.format_result()), ::boost::end(M.format_result()), Output );
Output = std::copy( ::boost::begin(M.format_result()), ::boost::end(M.format_result()), Output );
// Proceed to the next match
LastMatch=M.end();
@ -67,7 +67,7 @@ namespace boost {
}
// Copy the rest of the sequence
std::copy( LastMatch, ::boost::end(Input), Output );
Output = std::copy( LastMatch, ::boost::end(Input), Output );
return Output;
}