[Boost-commit] svn:boost r80809 - trunk/boost/algorithm/string/detail

Subject: [Boost-commit] svn:boost r80809 - trunk/boost/algorithm/string/detail
From: marshall_at_[hidden]
Date: 2012-10-01 11:42:40

Author: marshall
Date: 2012-10-01 11:42:40 EDT (Mon, 01 Oct 2012)
New Revision: 80809
URL: http://svn.boost.org/trac/boost/changeset/80809

Log:
Qualified some calls to insert to remove ambiguity; Refs #7346 Thanks to Yusuke Ichinohe for the bug report/fix
Text files modified: 
   trunk/boost/algorithm/string/detail/find_format.hpp     |     6 +++---                                  
   trunk/boost/algorithm/string/detail/find_format_all.hpp |     4 ++--                                    
   2 files changed, 5 insertions(+), 5 deletions(-)

Modified: trunk/boost/algorithm/string/detail/find_format.hpp
==============================================================================
--- trunk/boost/algorithm/string/detail/find_format.hpp	(original)
+++ trunk/boost/algorithm/string/detail/find_format.hpp	2012-10-01 11:42:40 EDT (Mon, 01 Oct 2012)
@@ -118,11 +118,11 @@
 
                 InputT Output;
                 // 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
-                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
-                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;
             }

Modified: trunk/boost/algorithm/string/detail/find_format_all.hpp
==============================================================================
--- trunk/boost/algorithm/string/detail/find_format_all.hpp	(original)
+++ trunk/boost/algorithm/string/detail/find_format_all.hpp	2012-10-01 11:42:40 EDT (Mon, 01 Oct 2012)
@@ -134,9 +134,9 @@
                 while( M )
                 {
                     // 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
-                    insert( Output, ::boost::end(Output), M.format_result() );
+                    boost::algorithm::detail::insert( Output, ::boost::end(Output), M.format_result() );
 
                     // Proceed to the next match
                     LastMatch=M.end();