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

Qualified some calls to insert to remove ambiguity; Refs #7346 Thanks to Yusuke Ichinohe for the bug report/fix

Browse Source 
[SVN r80809]
This commit is contained in:
Marshall Clow
2012-10-01 15:42:40 +00:00
parent 87f97645da
commit 234656765a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,11 +118,11 @@ namespace boost {
InputT Output; InputT Output;
// Copy the beginning of the sequence // Copy the beginning of the sequence
insert( Output, ::boost::end(Output), ::boost::begin(Input), M.begin() ); boost::algorithm::detail::insert( Output, ::boost::end(Output), ::boost::begin(Input), M.begin() );
// Copy formated result // Copy formated result
insert( Output, ::boost::end(Output), M.format_result() ); boost::algorithm::detail::insert( Output, ::boost::end(Output), M.format_result() );
// Copy the rest of the sequence // Copy the rest of the sequence
insert( Output, ::boost::end(Output), M.end(), ::boost::end(Input) ); boost::algorithm::detail::insert( Output, ::boost::end(Output), M.end(), ::boost::end(Input) );
return Output; return Output;
} }

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

@ -134,9 +134,9 @@ namespace boost {
while( M ) while( M )
{ {
// Copy the beginning of the sequence // Copy the beginning of the sequence
insert( Output, ::boost::end(Output), LastMatch, M.begin() ); boost::algorithm::detail::insert( Output, ::boost::end(Output), LastMatch, M.begin() );
// Copy formated result // Copy formated result
insert( Output, ::boost::end(Output), M.format_result() ); boost::algorithm::detail::insert( Output, ::boost::end(Output), M.format_result() );
// Proceed to the next match // Proceed to the next match
LastMatch=M.end(); LastMatch=M.end();