Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r55424 - in trunk/boost/algorithm/string: . detail
From: droba_at_[hidden]
Date: 2009-08-05 16:01:14


Author: pavol_droba
Date: 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
New Revision: 55424
URL: http://svn.boost.org/trac/boost/changeset/55424

Log:
Merged ADL protection patch from Neil Groves

Text files modified:
   trunk/boost/algorithm/string/case_conv.hpp | 8
   trunk/boost/algorithm/string/classification.hpp | 2
   trunk/boost/algorithm/string/detail/case_conv.hpp | 4
   trunk/boost/algorithm/string/detail/find_format.hpp | 8
   trunk/boost/algorithm/string/detail/find_format_all.hpp | 16 +-
   trunk/boost/algorithm/string/detail/finder.hpp | 16 +-
   trunk/boost/algorithm/string/detail/finder_regex.hpp | 2
   trunk/boost/algorithm/string/detail/predicate.hpp | 2
   trunk/boost/algorithm/string/detail/replace_storage.hpp | 4
   trunk/boost/algorithm/string/detail/sequence.hpp | 6
   trunk/boost/algorithm/string/detail/trim.hpp | 2
   trunk/boost/algorithm/string/erase.hpp | 196 +++++++++++++++++++-------------------
   trunk/boost/algorithm/string/find.hpp | 20 ++--
   trunk/boost/algorithm/string/find_format.hpp | 82 ++++++++++------
   trunk/boost/algorithm/string/find_iterator.hpp | 6
   trunk/boost/algorithm/string/finder.hpp | 12 +-
   trunk/boost/algorithm/string/formatter.hpp | 2
   trunk/boost/algorithm/string/iter_find.hpp | 25 ++--
   trunk/boost/algorithm/string/join.hpp | 4
   trunk/boost/algorithm/string/predicate.hpp | 46 ++++----
   trunk/boost/algorithm/string/regex.hpp | 96 +++++++++---------
   trunk/boost/algorithm/string/replace.hpp | 198 ++++++++++++++++++++--------------------
   trunk/boost/algorithm/string/split.hpp | 12 +-
   trunk/boost/algorithm/string/trim.hpp | 22 ++--
   24 files changed, 406 insertions(+), 385 deletions(-)

Modified: trunk/boost/algorithm/string/case_conv.hpp
==============================================================================
--- trunk/boost/algorithm/string/case_conv.hpp (original)
+++ trunk/boost/algorithm/string/case_conv.hpp 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -59,7 +59,7 @@
         {
             return ::boost::algorithm::detail::transform_range_copy(
                Output,
- as_literal(Input),
+ ::boost::as_literal(Input),
                ::boost::algorithm::detail::to_lowerF<
                     typename range_value<RangeT>::type >(Loc));
         }
@@ -93,7 +93,7 @@
             const std::locale& Loc=std::locale())
         {
             ::boost::algorithm::detail::transform_range(
- as_literal(Input),
+ ::boost::as_literal(Input),
                 ::boost::algorithm::detail::to_lowerF<
                     typename range_value<WritableRangeT>::type >(Loc));
         }
@@ -124,7 +124,7 @@
         {
             return ::boost::algorithm::detail::transform_range_copy(
                Output,
- as_literal(Input),
+ ::boost::as_literal(Input),
                ::boost::algorithm::detail::to_upperF<
                     typename range_value<RangeT>::type >(Loc));
         }
@@ -158,7 +158,7 @@
             const std::locale& Loc=std::locale())
         {
             ::boost::algorithm::detail::transform_range(
- as_literal(Input),
+ ::boost::as_literal(Input),
                 ::boost::algorithm::detail::to_upperF<
                     typename range_value<WritableRangeT>::type >(Loc));
         }

Modified: trunk/boost/algorithm/string/classification.hpp
==============================================================================
--- trunk/boost/algorithm/string/classification.hpp (original)
+++ trunk/boost/algorithm/string/classification.hpp 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -202,7 +202,7 @@
             BOOST_STRING_TYPENAME range_value<RangeT>::type>
         is_any_of( const RangeT& Set )
         {
- iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_set(as_literal(Set));
+ iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_set(boost::as_literal(Set));
             return detail::is_any_ofF<BOOST_STRING_TYPENAME range_value<RangeT>::type>(lit_set);
         }
 

Modified: trunk/boost/algorithm/string/detail/case_conv.hpp
==============================================================================
--- trunk/boost/algorithm/string/detail/case_conv.hpp (original)
+++ trunk/boost/algorithm/string/detail/case_conv.hpp 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -105,10 +105,10 @@
                 FunctorT Functor)
             {
                 return SequenceT(
- make_transform_iterator(
+ ::boost::make_transform_iterator(
                         ::boost::begin(Input),
                         Functor),
- make_transform_iterator(
+ ::boost::make_transform_iterator(
                         ::boost::end(Input),
                         Functor));
             }

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 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -35,7 +35,7 @@
                 FormatterT Formatter,
                 const FindResultT& FindResult )
             {
- return find_format_copy_impl2(
+ return ::boost::algorithm::detail::find_format_copy_impl2(
                     Output,
                     Input,
                     Formatter,
@@ -94,7 +94,7 @@
                 FormatterT Formatter,
                 const FindResultT& FindResult)
             {
- return find_format_copy_impl2(
+ return ::boost::algorithm::detail::find_format_copy_impl2(
                     Input,
                     Formatter,
                     FindResult,
@@ -149,7 +149,7 @@
                 FormatterT Formatter,
                 const FindResultT& FindResult)
             {
- find_format_impl2(
+ ::boost::algorithm::detail::find_format_impl2(
                     Input,
                     Formatter,
                     FindResult,
@@ -183,7 +183,7 @@
                 }
 
                 // Replace match
- replace( Input, M.begin(), M.end(), M.format_result() );
+ ::boost::algorithm::detail::replace( Input, M.begin(), M.end(), M.format_result() );
             }
 
         } // namespace detail

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 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -37,7 +37,7 @@
                 FormatterT Formatter,
                 const FindResultT& FindResult )
             {
- return find_format_all_copy_impl2(
+ return ::boost::algorithm::detail::find_format_all_copy_impl2(
                     Output,
                     Input,
                     Finder,
@@ -107,7 +107,7 @@
                 FormatterT Formatter,
                 const FindResultT& FindResult)
             {
- return find_format_all_copy_impl2(
+ return ::boost::algorithm::detail::find_format_all_copy_impl2(
                     Input,
                     Finder,
                     Formatter,
@@ -159,7 +159,7 @@
                 }
 
                 // Copy the rest of the sequence
- insert( Output, ::boost::end(Output), LastMatch, ::boost::end(Input) );
+ ::boost::algorithm::detail::insert( Output, ::boost::end(Output), LastMatch, ::boost::end(Input) );
 
                 return Output;
             }
@@ -177,7 +177,7 @@
                 FormatterT Formatter,
                 FindResultT FindResult)
             {
- find_format_all_impl2(
+ ::boost::algorithm::detail::find_format_all_impl2(
                     Input,
                     Finder,
                     Formatter,
@@ -230,14 +230,14 @@
                     SearchIt=M.end();
 
                     // Copy formated replace to the storage
- copy_to_storage( Storage, M.format_result() );
+ ::boost::algorithm::detail::copy_to_storage( Storage, M.format_result() );
 
                     // Find range for a next match
                     M=Finder( SearchIt, ::boost::end(Input) );
                 }
 
                 // process the last segment
- InsertIt=process_segment(
+ InsertIt=::boost::algorithm::detail::process_segment(
                     Storage,
                     Input,
                     InsertIt,
@@ -247,12 +247,12 @@
                 if ( Storage.empty() )
                 {
                     // Truncate input
- erase( Input, InsertIt, ::boost::end(Input) );
+ ::boost::algorithm::detail::erase( Input, InsertIt, ::boost::end(Input) );
                 }
                 else
                 {
                     // Copy remaining data to the end of input
- insert( Input, ::boost::end(Input), Storage.begin(), Storage.end() );
+ ::boost::algorithm::detail::insert( Input, ::boost::end(Input), Storage.begin(), Storage.end() );
                 }
             }
 

Modified: trunk/boost/algorithm/string/detail/finder.hpp
==============================================================================
--- trunk/boost/algorithm/string/detail/finder.hpp (original)
+++ trunk/boost/algorithm/string/detail/finder.hpp 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -382,7 +382,7 @@
                 typedef BOOST_STRING_TYPENAME boost::detail::
                     iterator_traits<ForwardIteratorT>::iterator_category category;
 
- return find_head_impl( Begin, End, N, category() );
+ return ::boost::algorithm::detail::find_head_impl( Begin, End, N, category() );
             }
 
             template< typename ForwardIteratorT >
@@ -456,7 +456,7 @@
                 typedef BOOST_STRING_TYPENAME boost::detail::
                     iterator_traits<ForwardIteratorT>::iterator_category category;
 
- return find_tail_impl( Begin, End, N, category() );
+ return ::boost::algorithm::detail::find_tail_impl( Begin, End, N, category() );
             }
 
 
@@ -484,14 +484,14 @@
                 {
                     if(m_N>=0)
                     {
- return find_head_impl( Begin, End, m_N );
+ return ::boost::algorithm::detail::find_head_impl( Begin, End, m_N );
                     }
                     else
                     {
                         iterator_range<ForwardIteratorT> Res=
- find_tail_impl( Begin, End, -m_N );
+ ::boost::algorithm::detail::find_tail_impl( Begin, End, -m_N );
 
- return make_iterator_range(Begin, Res.begin());
+ return ::boost::make_iterator_range(Begin, Res.begin());
                     }
                 }
 
@@ -522,14 +522,14 @@
                 {
                     if(m_N>=0)
                     {
- return find_tail_impl( Begin, End, m_N );
+ return ::boost::algorithm::detail::find_tail_impl( Begin, End, m_N );
                     }
                     else
                     {
                         iterator_range<ForwardIteratorT> Res=
- find_head_impl( Begin, End, -m_N );
+ ::boost::algorithm::detail::find_head_impl( Begin, End, -m_N );
 
- return make_iterator_range(Res.end(), End);
+ return ::boost::make_iterator_range(Res.end(), End);
                     }
                 }
 

Modified: trunk/boost/algorithm/string/detail/finder_regex.hpp
==============================================================================
--- trunk/boost/algorithm/string/detail/finder_regex.hpp (original)
+++ trunk/boost/algorithm/string/detail/finder_regex.hpp 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -98,7 +98,7 @@
                     // instantiate match result
                     match_results<input_iterator_type> result;
                     // search for a match
- if ( regex_search( Begin, End, result, m_Rx, m_MatchFlags ) )
+ if ( ::boost::regex_search( Begin, End, result, m_Rx, m_MatchFlags ) )
                     {
                         // construct a result
                         return result_type( result );

Modified: trunk/boost/algorithm/string/detail/predicate.hpp
==============================================================================
--- trunk/boost/algorithm/string/detail/predicate.hpp (original)
+++ trunk/boost/algorithm/string/detail/predicate.hpp 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -63,7 +63,7 @@
 
                 iterator_range<ForwardIterator1T> Result
                     =last_finder(
- make_iterator_range(SubBegin, SubEnd),
+ ::boost::make_iterator_range(SubBegin, SubEnd),
                         Comp)(Begin, End);
 
                 return !Result.empty() && Result.end()==End;

Modified: trunk/boost/algorithm/string/detail/replace_storage.hpp
==============================================================================
--- trunk/boost/algorithm/string/detail/replace_storage.hpp (original)
+++ trunk/boost/algorithm/string/detail/replace_storage.hpp 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -68,7 +68,7 @@
                     ForwardIteratorT SegmentEnd )
                 {
                     // Copy data from the storage until the beginning of the segment
- ForwardIteratorT It=move_from_storage( Storage, InsertIt, SegmentBegin );
+ ForwardIteratorT It=::boost::algorithm::detail::move_from_storage( Storage, InsertIt, SegmentBegin );
 
                     // 3 cases are possible :
                     // a) Storage is empty, It==SegmentBegin
@@ -125,7 +125,7 @@
 
                 {
                     // Call replace to do the job
- replace( Input, InsertIt, SegmentBegin, Storage );
+ ::boost::algorithm::detail::replace( Input, InsertIt, SegmentBegin, Storage );
                     // Empty the storage
                     Storage.clear();
                     // Iterators were not changed, simply return the end of segment

Modified: trunk/boost/algorithm/string/detail/sequence.hpp
==============================================================================
--- trunk/boost/algorithm/string/detail/sequence.hpp (original)
+++ trunk/boost/algorithm/string/detail/sequence.hpp 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -41,7 +41,7 @@
                 BOOST_STRING_TYPENAME InputT::iterator At,
                 const InsertT& Insert )
             {
- insert( Input, At, ::boost::begin(Insert), ::boost::end(Insert) );
+ ::boost::algorithm::detail::insert( Input, At, ::boost::begin(Insert), ::boost::end(Insert) );
             }
            
 // erase helper ---------------------------------------------------//
@@ -184,11 +184,11 @@
             {
                 if(From!=To)
                 {
- replace( Input, From, To, ::boost::begin(Insert), ::boost::end(Insert) );
+ ::boost::algorithm::detail::replace( Input, From, To, ::boost::begin(Insert), ::boost::end(Insert) );
                 }
                 else
                 {
- insert( Input, From, ::boost::begin(Insert), ::boost::end(Insert) );
+ ::boost::algorithm::detail::insert( Input, From, ::boost::begin(Insert), ::boost::end(Insert) );
                 }
             }
 

Modified: trunk/boost/algorithm/string/detail/trim.hpp
==============================================================================
--- trunk/boost/algorithm/string/detail/trim.hpp (original)
+++ trunk/boost/algorithm/string/detail/trim.hpp 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -47,7 +47,7 @@
                 typedef BOOST_STRING_TYPENAME boost::detail::
                     iterator_traits<ForwardIteratorT>::iterator_category category;
 
- return trim_end_iter_select( InBegin, InEnd, IsSpace, category() );
+ return ::boost::algorithm::detail::trim_end_iter_select( InBegin, InEnd, IsSpace, category() );
             }
 
             template< typename ForwardIteratorT, typename PredicateT >

Modified: trunk/boost/algorithm/string/erase.hpp
==============================================================================
--- trunk/boost/algorithm/string/erase.hpp (original)
+++ trunk/boost/algorithm/string/erase.hpp 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -54,11 +54,11 @@
                 BOOST_STRING_TYPENAME
                     range_const_iterator<RangeT>::type>& SearchRange )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Output,
                 Input,
- range_finder(SearchRange),
- empty_formatter(Input) );
+ ::boost::algorithm::range_finder(SearchRange),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
         //! Erase range algorithm
@@ -72,10 +72,10 @@
                 BOOST_STRING_TYPENAME
                     range_const_iterator<SequenceT>::type>& SearchRange )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Input,
- range_finder(SearchRange),
- empty_formatter(Input) );
+ ::boost::algorithm::range_finder(SearchRange),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
         //! Erase range algorithm
@@ -93,10 +93,10 @@
                 BOOST_STRING_TYPENAME
                     range_iterator<SequenceT>::type>& SearchRange )
         {
- find_format(
+ ::boost::algorithm::find_format(
                 Input,
- range_finder(SearchRange),
- empty_formatter(Input) );
+ ::boost::algorithm::range_finder(SearchRange),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
 // erase_first --------------------------------------------------------//
@@ -124,11 +124,11 @@
             const Range1T& Input,
             const Range2T& Search )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Output,
                 Input,
- first_finder(Search),
- empty_formatter(Input) );
+ ::boost::algorithm::first_finder(Search),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
         //! Erase first algorithm
@@ -140,10 +140,10 @@
             const SequenceT& Input,
             const RangeT& Search )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Input,
- first_finder(Search),
- empty_formatter(Input) );
+ ::boost::algorithm::first_finder(Search),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
         //! Erase first algorithm
@@ -159,10 +159,10 @@
             SequenceT& Input,
             const RangeT& Search )
         {
- find_format(
+ ::boost::algorithm::find_format(
                 Input,
- first_finder(Search),
- empty_formatter(Input) );
+ ::boost::algorithm::first_finder(Search),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
 // erase_first ( case insensitive ) ------------------------------------//
@@ -193,11 +193,11 @@
             const Range2T& Search,
             const std::locale& Loc=std::locale() )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Output,
                 Input,
- first_finder(Search, is_iequal(Loc)),
- empty_formatter(Input) );
+ ::boost::algorithm::first_finder(Search, is_iequal(Loc)),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
         //! Erase first algorithm ( case insensitive )
@@ -210,10 +210,10 @@
             const RangeT& Search,
             const std::locale& Loc=std::locale() )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Input,
- first_finder(Search, is_iequal(Loc)),
- empty_formatter(Input) );
+ ::boost::algorithm::first_finder(Search, is_iequal(Loc)),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
         //! Erase first algorithm ( case insensitive )
@@ -231,10 +231,10 @@
             const RangeT& Search,
             const std::locale& Loc=std::locale() )
         {
- find_format(
+ ::boost::algorithm::find_format(
                 Input,
- first_finder(Search, is_iequal(Loc)),
- empty_formatter(Input) );
+ ::boost::algorithm::first_finder(Search, is_iequal(Loc)),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
 // erase_last --------------------------------------------------------//
@@ -262,11 +262,11 @@
             const Range1T& Input,
             const Range2T& Search )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Output,
                 Input,
- last_finder(Search),
- empty_formatter(Input) );
+ ::boost::algorithm::last_finder(Search),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
         //! Erase last algorithm
@@ -278,10 +278,10 @@
             const SequenceT& Input,
             const RangeT& Search )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Input,
- last_finder(Search),
- empty_formatter(Input) );
+ ::boost::algorithm::last_finder(Search),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
         //! Erase last algorithm
@@ -297,10 +297,10 @@
             SequenceT& Input,
             const RangeT& Search )
         {
- find_format(
+ ::boost::algorithm::find_format(
                 Input,
- last_finder(Search),
- empty_formatter(Input) );
+ ::boost::algorithm::last_finder(Search),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
 // erase_last ( case insensitive ) ------------------------------------//
@@ -331,11 +331,11 @@
             const Range2T& Search,
             const std::locale& Loc=std::locale() )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Output,
                 Input,
- last_finder(Search, is_iequal(Loc)),
- empty_formatter(Input) );
+ ::boost::algorithm::last_finder(Search, is_iequal(Loc)),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
         //! Erase last algorithm ( case insensitive )
@@ -348,10 +348,10 @@
             const RangeT& Search,
             const std::locale& Loc=std::locale() )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Input,
- last_finder(Search, is_iequal(Loc)),
- empty_formatter(Input) );
+ ::boost::algorithm::last_finder(Search, is_iequal(Loc)),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
         //! Erase last algorithm ( case insensitive )
@@ -369,10 +369,10 @@
             const RangeT& Search,
             const std::locale& Loc=std::locale() )
         {
- find_format(
+ ::boost::algorithm::find_format(
                 Input,
- last_finder(Search, is_iequal(Loc)),
- empty_formatter(Input) );
+ ::boost::algorithm::last_finder(Search, is_iequal(Loc)),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
 // erase_nth --------------------------------------------------------------------//
@@ -404,11 +404,11 @@
             const Range2T& Search,
             int Nth )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Output,
                 Input,
- nth_finder(Search, Nth),
- empty_formatter(Input) );
+ ::boost::algorithm::nth_finder(Search, Nth),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
         //! Erase nth algorithm
@@ -421,10 +421,10 @@
             const RangeT& Search,
             int Nth )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Input,
- nth_finder(Search, Nth),
- empty_formatter(Input) );
+ ::boost::algorithm::nth_finder(Search, Nth),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
         //! Erase nth algorithm
@@ -443,10 +443,10 @@
             const RangeT& Search,
             int Nth )
         {
- find_format(
+ ::boost::algorithm::find_format(
                 Input,
- nth_finder(Search, Nth),
- empty_formatter(Input) );
+ ::boost::algorithm::nth_finder(Search, Nth),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
 // erase_nth ( case insensitive ) ---------------------------------------------//
@@ -480,11 +480,11 @@
             int Nth,
             const std::locale& Loc=std::locale() )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Output,
                 Input,
- nth_finder(Search, Nth, is_iequal(Loc)),
- empty_formatter(Input) );
+ ::boost::algorithm::nth_finder(Search, Nth, is_iequal(Loc)),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
         //! Erase nth algorithm
@@ -498,9 +498,9 @@
             int Nth,
             const std::locale& Loc=std::locale() )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Input,
- nth_finder(Search, Nth, is_iequal(Loc)),
+ ::boost::algorithm::nth_finder(Search, Nth, is_iequal(Loc)),
                 empty_formatter(Input) );
         }
 
@@ -522,10 +522,10 @@
             int Nth,
             const std::locale& Loc=std::locale() )
         {
- find_format(
+ ::boost::algorithm::find_format(
                 Input,
- nth_finder(Search, Nth, is_iequal(Loc)),
- empty_formatter(Input) );
+ ::boost::algorithm::nth_finder(Search, Nth, is_iequal(Loc)),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
 
@@ -555,11 +555,11 @@
             const Range1T& Input,
             const Range2T& Search )
         {
- return find_format_all_copy(
+ return ::boost::algorithm::find_format_all_copy(
                 Output,
                 Input,
- first_finder(Search),
- empty_formatter(Input) );
+ ::boost::algorithm::first_finder(Search),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
         //! Erase all algorithm
@@ -571,10 +571,10 @@
             const SequenceT& Input,
             const RangeT& Search )
         {
- return find_format_all_copy(
+ return ::boost::algorithm::find_format_all_copy(
                 Input,
- first_finder(Search),
- empty_formatter(Input) );
+ ::boost::algorithm::first_finder(Search),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
         //! Erase all algorithm
@@ -590,10 +590,10 @@
             SequenceT& Input,
             const RangeT& Search )
         {
- find_format_all(
+ ::boost::algorithm::find_format_all(
                 Input,
- first_finder(Search),
- empty_formatter(Input) );
+ ::boost::algorithm::first_finder(Search),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
 // erase_all ( case insensitive ) ------------------------------------//
@@ -624,11 +624,11 @@
             const Range2T& Search,
             const std::locale& Loc=std::locale() )
         {
- return find_format_all_copy(
+ return ::boost::algorithm::find_format_all_copy(
                 Output,
                 Input,
- first_finder(Search, is_iequal(Loc)),
- empty_formatter(Input) );
+ ::boost::algorithm::first_finder(Search, is_iequal(Loc)),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
         //! Erase all algorithm ( case insensitive )
@@ -641,10 +641,10 @@
             const RangeT& Search,
             const std::locale& Loc=std::locale() )
         {
- return find_format_all_copy(
+ return ::boost::algorithm::find_format_all_copy(
                 Input,
- first_finder(Search, is_iequal(Loc)),
- empty_formatter(Input) );
+ ::boost::algorithm::first_finder(Search, is_iequal(Loc)),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
         //! Erase all algorithm ( case insensitive )
@@ -662,10 +662,10 @@
             const RangeT& Search,
             const std::locale& Loc=std::locale() )
         {
- find_format_all(
+ ::boost::algorithm::find_format_all(
                 Input,
- first_finder(Search, is_iequal(Loc)),
- empty_formatter(Input) );
+ ::boost::algorithm::first_finder(Search, is_iequal(Loc)),
+ ::boost::algorithm::empty_formatter(Input) );
         }
 
 // erase_head --------------------------------------------------------------------//
@@ -696,11 +696,11 @@
             const RangeT& Input,
             int N )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Output,
                 Input,
- head_finder(N),
- empty_formatter( Input ) );
+ ::boost::algorithm::head_finder(N),
+ ::boost::algorithm::empty_formatter( Input ) );
         }
 
         //! Erase head algorithm
@@ -712,10 +712,10 @@
             const SequenceT& Input,
             int N )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Input,
- head_finder(N),
- empty_formatter( Input ) );
+ ::boost::algorithm::head_finder(N),
+ ::boost::algorithm::empty_formatter( Input ) );
         }
 
         //! Erase head algorithm
@@ -734,10 +734,10 @@
             SequenceT& Input,
             int N )
         {
- find_format(
+ ::boost::algorithm::find_format(
                 Input,
- head_finder(N),
- empty_formatter( Input ) );
+ ::boost::algorithm::head_finder(N),
+ ::boost::algorithm::empty_formatter( Input ) );
         }
 
 // erase_tail --------------------------------------------------------------------//
@@ -768,11 +768,11 @@
             const RangeT& Input,
             int N )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Output,
                 Input,
- tail_finder(N),
- empty_formatter( Input ) );
+ ::boost::algorithm::tail_finder(N),
+ ::boost::algorithm::empty_formatter( Input ) );
         }
 
         //! Erase tail algorithm
@@ -784,10 +784,10 @@
             const SequenceT& Input,
             int N )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Input,
- tail_finder(N),
- empty_formatter( Input ) );
+ ::boost::algorithm::tail_finder(N),
+ ::boost::algorithm::empty_formatter( Input ) );
         }
 
         //! Erase tail algorithm
@@ -806,10 +806,10 @@
             SequenceT& Input,
             int N )
         {
- find_format(
+ ::boost::algorithm::find_format(
                 Input,
- tail_finder(N),
- empty_formatter( Input ) );
+ ::boost::algorithm::tail_finder(N),
+ ::boost::algorithm::empty_formatter( Input ) );
         }
 
     } // namespace algorithm

Modified: trunk/boost/algorithm/string/find.hpp
==============================================================================
--- trunk/boost/algorithm/string/find.hpp (original)
+++ trunk/boost/algorithm/string/find.hpp 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -53,7 +53,7 @@
             RangeT& Input,
             const FinderT& Finder)
         {
- iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_input(as_literal(Input));
+ iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_input(::boost::as_literal(Input));
 
             return Finder(::boost::begin(lit_input),::boost::end(lit_input));
         }
@@ -81,7 +81,7 @@
             Range1T& Input,
             const Range2T& Search)
         {
- return find(Input, first_finder(Search));
+ return ::boost::algorithm::find(Input, ::boost::algorithm::first_finder(Search));
         }
 
         //! Find first algorithm ( case insensitive )
@@ -108,7 +108,7 @@
             const Range2T& Search,
             const std::locale& Loc=std::locale())
         {
- return find(Input, first_finder(Search,is_iequal(Loc)));
+ return ::boost::algorithm::find(Input, ::boost::algorithm::first_finder(Search,is_iequal(Loc)));
         }
 
 // find_last -----------------------------------------------//
@@ -134,7 +134,7 @@
             Range1T& Input,
             const Range2T& Search)
         {
- return find(Input, last_finder(Search));
+ return ::boost::algorithm::find(Input, ::boost::algorithm::last_finder(Search));
         }
 
         //! Find last algorithm ( case insensitive )
@@ -161,7 +161,7 @@
             const Range2T& Search,
             const std::locale& Loc=std::locale())
         {
- return find(Input, last_finder(Search, is_iequal(Loc)));
+ return ::boost::algorithm::find(Input, ::boost::algorithm::last_finder(Search, is_iequal(Loc)));
         }
 
 // find_nth ----------------------------------------------------------------------//
@@ -189,7 +189,7 @@
             const Range2T& Search,
             int Nth)
         {
- return find(Input, nth_finder(Search,Nth));
+ return ::boost::algorithm::find(Input, ::boost::algorithm::nth_finder(Search,Nth));
         }
 
         //! Find n-th algorithm ( case insensitive ).
@@ -220,7 +220,7 @@
             int Nth,
             const std::locale& Loc=std::locale())
         {
- return find(Input, nth_finder(Search,Nth,is_iequal(Loc)));
+ return ::boost::algorithm::find(Input, ::boost::algorithm::nth_finder(Search,Nth,is_iequal(Loc)));
         }
 
 // find_head ----------------------------------------------------------------------//
@@ -250,7 +250,7 @@
             RangeT& Input,
             int N)
         {
- return find(Input, head_finder(N));
+ return ::boost::algorithm::find(Input, ::boost::algorithm::head_finder(N));
         }
 
 // find_tail ----------------------------------------------------------------------//
@@ -281,7 +281,7 @@
             RangeT& Input,
             int N)
         {
- return find(Input, tail_finder(N));
+ return ::boost::algorithm::find(Input, ::boost::algorithm::tail_finder(N));
         }
 
 // find_token --------------------------------------------------------------------//
@@ -311,7 +311,7 @@
             PredicateT Pred,
             token_compress_mode_type eCompress=token_compress_off)
         {
- return find(Input, token_finder(Pred, eCompress));
+ return ::boost::algorithm::find(Input, ::boost::algorithm::token_finder(Pred, eCompress));
         }
 
     } // namespace algorithm

Modified: trunk/boost/algorithm/string/find_format.hpp
==============================================================================
--- trunk/boost/algorithm/string/find_format.hpp (original)
+++ trunk/boost/algorithm/string/find_format.hpp 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -62,15 +62,18 @@
             FormatterT Formatter )
         {
             // Concept check
- function_requires<
- FinderConcept<FinderT,
- BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> >();
- function_requires<
+ BOOST_CONCEPT_ASSERT((
+ FinderConcept<
+ FinderT,
+ BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type>
+ ));
+ BOOST_CONCEPT_ASSERT((
                 FormatterConcept<
                     FormatterT,
- FinderT,BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> >();
+ FinderT,BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type>
+ ));
 
- iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_input(as_literal(Input));
+ iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_input(::boost::as_literal(Input));
 
             return detail::find_format_copy_impl(
                 Output,
@@ -93,13 +96,16 @@
             FormatterT Formatter )
         {
             // Concept check
- function_requires<
- FinderConcept<FinderT,
- BOOST_STRING_TYPENAME range_const_iterator<SequenceT>::type> >();
- function_requires<
+ BOOST_CONCEPT_ASSERT((
+ FinderConcept<
+ FinderT,
+ BOOST_STRING_TYPENAME range_const_iterator<SequenceT>::type>
+ ));
+ BOOST_CONCEPT_ASSERT((
                 FormatterConcept<
                     FormatterT,
- FinderT,BOOST_STRING_TYPENAME range_const_iterator<SequenceT>::type> >();
+ FinderT,BOOST_STRING_TYPENAME range_const_iterator<SequenceT>::type>
+ ));
 
             return detail::find_format_copy_impl(
                 Input,
@@ -126,13 +132,16 @@
             FormatterT Formatter)
         {
             // Concept check
- function_requires<
- FinderConcept<FinderT,
- BOOST_STRING_TYPENAME range_const_iterator<SequenceT>::type> >();
- function_requires<
+ BOOST_CONCEPT_ASSERT((
+ FinderConcept<
+ FinderT,
+ BOOST_STRING_TYPENAME range_const_iterator<SequenceT>::type>
+ ));
+ BOOST_CONCEPT_ASSERT((
                 FormatterConcept<
                     FormatterT,
- FinderT,BOOST_STRING_TYPENAME range_const_iterator<SequenceT>::type> >();
+ FinderT,BOOST_STRING_TYPENAME range_const_iterator<SequenceT>::type>
+ ));
 
             detail::find_format_impl(
                 Input,
@@ -172,15 +181,18 @@
             FormatterT Formatter)
         {
             // Concept check
- function_requires<
- FinderConcept<FinderT,
- BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> >();
- function_requires<
+ BOOST_CONCEPT_ASSERT((
+ FinderConcept<
+ FinderT,
+ BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type>
+ ));
+ BOOST_CONCEPT_ASSERT((
                 FormatterConcept<
                     FormatterT,
- FinderT,BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> >();
+ FinderT,BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type>
+ ));
 
- iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_input(as_literal(Input));
+ iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_input(::boost::as_literal(Input));
 
             return detail::find_format_all_copy_impl(
                 Output,
@@ -204,13 +216,16 @@
             FormatterT Formatter )
         {
             // Concept check
- function_requires<
- FinderConcept<FinderT,
- BOOST_STRING_TYPENAME range_const_iterator<SequenceT>::type> >();
- function_requires<
+ BOOST_CONCEPT_ASSERT((
+ FinderConcept<
+ FinderT,
+ BOOST_STRING_TYPENAME range_const_iterator<SequenceT>::type>
+ ));
+ BOOST_CONCEPT_ASSERT((
                 FormatterConcept<
                     FormatterT,
- FinderT,BOOST_STRING_TYPENAME range_const_iterator<SequenceT>::type> >();
+ FinderT,BOOST_STRING_TYPENAME range_const_iterator<SequenceT>::type>
+ ));
 
             return detail::find_format_all_copy_impl(
                 Input,
@@ -239,13 +254,16 @@
             FormatterT Formatter )
         {
             // Concept check
- function_requires<
- FinderConcept<FinderT,
- BOOST_STRING_TYPENAME range_const_iterator<SequenceT>::type> >();
- function_requires<
+ BOOST_CONCEPT_ASSERT((
+ FinderConcept<
+ FinderT,
+ BOOST_STRING_TYPENAME range_const_iterator<SequenceT>::type>
+ ));
+ BOOST_CONCEPT_ASSERT((
                 FormatterConcept<
                     FormatterT,
- FinderT,BOOST_STRING_TYPENAME range_const_iterator<SequenceT>::type> >();
+ FinderT,BOOST_STRING_TYPENAME range_const_iterator<SequenceT>::type>
+ ));
 
             detail::find_format_all_impl(
                 Input,

Modified: trunk/boost/algorithm/string/find_iterator.hpp
==============================================================================
--- trunk/boost/algorithm/string/find_iterator.hpp (original)
+++ trunk/boost/algorithm/string/find_iterator.hpp 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -113,8 +113,8 @@
                     FinderT Finder ) :
                 detail::find_iterator_base<IteratorT>(Finder,0)
             {
- iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_col(as_literal(Col));
- m_Match=make_iterator_range(::boost::begin(lit_col), ::boost::begin(lit_col));
+ iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_col(::boost::as_literal(Col));
+ m_Match=::boost::make_iterator_range(::boost::begin(lit_col), ::boost::begin(lit_col));
                 m_End=::boost::end(lit_col);
 
                 increment();
@@ -273,7 +273,7 @@
                 detail::find_iterator_base<IteratorT>(Finder,0),
                 m_bEof(false)
             {
- iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_col(as_literal(Col));
+ iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_col(::boost::as_literal(Col));
                 m_Match=make_iterator_range(::boost::begin(lit_col), ::boost::begin(lit_col));
                 m_Next=::boost::begin(lit_col);
                 m_End=::boost::end(lit_col);

Modified: trunk/boost/algorithm/string/finder.hpp
==============================================================================
--- trunk/boost/algorithm/string/finder.hpp (original)
+++ trunk/boost/algorithm/string/finder.hpp 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -56,7 +56,7 @@
                 detail::first_finderF<
                     BOOST_STRING_TYPENAME
                         range_const_iterator<RangeT>::type,
- is_equal>( as_literal(Search), is_equal() ) ;
+ is_equal>( ::boost::as_literal(Search), is_equal() ) ;
         }
 
         //! "First" finder
@@ -74,7 +74,7 @@
                 detail::first_finderF<
                     BOOST_STRING_TYPENAME
                         range_const_iterator<RangeT>::type,
- PredicateT>( as_literal(Search), Comp );
+ PredicateT>( ::boost::as_literal(Search), Comp );
         }
 
         //! "Last" finder
@@ -97,7 +97,7 @@
                 detail::last_finderF<
                     BOOST_STRING_TYPENAME
                         range_const_iterator<RangeT>::type,
- is_equal>( as_literal(Search), is_equal() );
+ is_equal>( ::boost::as_literal(Search), is_equal() );
         }
         //! "Last" finder
         /*!
@@ -113,7 +113,7 @@
                 detail::last_finderF<
                     BOOST_STRING_TYPENAME
                         range_const_iterator<RangeT>::type,
- PredicateT>( as_literal(Search), Comp ) ;
+ PredicateT>( ::boost::as_literal(Search), Comp ) ;
         }
 
         //! "Nth" finder
@@ -139,7 +139,7 @@
                 detail::nth_finderF<
                     BOOST_STRING_TYPENAME
                         range_const_iterator<RangeT>::type,
- is_equal>( as_literal(Search), Nth, is_equal() ) ;
+ is_equal>( ::boost::as_literal(Search), Nth, is_equal() ) ;
         }
         //! "Nth" finder
         /*!
@@ -158,7 +158,7 @@
                 detail::nth_finderF<
                     BOOST_STRING_TYPENAME
                         range_const_iterator<RangeT>::type,
- PredicateT>( as_literal(Search), Nth, Comp );
+ PredicateT>( ::boost::as_literal(Search), Nth, Comp );
         }
 
         //! "Head" finder

Modified: trunk/boost/algorithm/string/formatter.hpp
==============================================================================
--- trunk/boost/algorithm/string/formatter.hpp (original)
+++ trunk/boost/algorithm/string/formatter.hpp 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -50,7 +50,7 @@
         {
             return detail::const_formatF<
                 iterator_range<
- BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> >(as_literal(Format));
+ BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> >(::boost::as_literal(Format));
         }
 
         //! Identity formatter

Modified: trunk/boost/algorithm/string/iter_find.hpp
==============================================================================
--- trunk/boost/algorithm/string/iter_find.hpp (original)
+++ trunk/boost/algorithm/string/iter_find.hpp 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -74,11 +74,13 @@
             RangeT& Input,
             FinderT Finder )
         {
- function_requires<
- FinderConcept<FinderT,
- BOOST_STRING_TYPENAME range_iterator<RangeT>::type> >();
+ BOOST_CONCEPT_ASSERT((
+ FinderConcept<
+ FinderT,
+ BOOST_STRING_TYPENAME range_iterator<RangeT>::type>
+ ));
 
- iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_input(as_literal(Input));
+ iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_input(::boost::as_literal(Input));
 
             typedef BOOST_STRING_TYPENAME
                 range_iterator<RangeT>::type input_iterator_type;
@@ -94,12 +96,12 @@
                 transform_iter_type;
     
             transform_iter_type itBegin=
- make_transform_iterator(
+ ::boost::make_transform_iterator(
                     find_iterator_type( ::boost::begin(lit_input), InputEnd, Finder ),
                     copy_range_type());
             
             transform_iter_type itEnd=
- make_transform_iterator(
+ ::boost::make_transform_iterator(
                     find_iterator_type(),
                     copy_range_type());
 
@@ -143,11 +145,12 @@
             RangeT& Input,
             FinderT Finder )
         {
- function_requires<
+ BOOST_CONCEPT_ASSERT((
                 FinderConcept<FinderT,
- BOOST_STRING_TYPENAME range_iterator<RangeT>::type> >();
+ BOOST_STRING_TYPENAME range_iterator<RangeT>::type>
+ ));
 
- iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_input(as_literal(Input));
+ iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_input(::boost::as_literal(Input));
 
             typedef BOOST_STRING_TYPENAME
                 range_iterator<RangeT>::type input_iterator_type;
@@ -163,12 +166,12 @@
                 transform_iter_type;
     
             transform_iter_type itBegin=
- make_transform_iterator(
+ ::boost::make_transform_iterator(
                     find_iterator_type( ::boost::begin(lit_input), InputEnd, Finder ),
                     copy_range_type() );
 
             transform_iter_type itEnd=
- make_transform_iterator(
+ ::boost::make_transform_iterator(
                     find_iterator_type(),
                     copy_range_type() );
             

Modified: trunk/boost/algorithm/string/join.hpp
==============================================================================
--- trunk/boost/algorithm/string/join.hpp (original)
+++ trunk/boost/algorithm/string/join.hpp 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -68,7 +68,7 @@
             for(;itBegin!=itEnd; ++itBegin)
             {
                 // Add separator
- detail::insert(Result, ::boost::end(Result), as_literal(Separator));
+ detail::insert(Result, ::boost::end(Result), ::boost::as_literal(Separator));
                 // Add element
                 detail::insert(Result, ::boost::end(Result), *itBegin);
             }
@@ -123,7 +123,7 @@
                 if(Pred(*itBegin))
                 {
                     // Add separator
- detail::insert(Result, ::boost::end(Result), as_literal(Separator));
+ detail::insert(Result, ::boost::end(Result), ::boost::as_literal(Separator));
                     // Add element
                     detail::insert(Result, ::boost::end(Result), *itBegin);
                 }

Modified: trunk/boost/algorithm/string/predicate.hpp
==============================================================================
--- trunk/boost/algorithm/string/predicate.hpp (original)
+++ trunk/boost/algorithm/string/predicate.hpp 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -59,8 +59,8 @@
             const Range2T& Test,
             PredicateT Comp)
         {
- iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range1T>::type> lit_input(as_literal(Input));
- iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range2T>::type> lit_test(as_literal(Test));
+ iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range1T>::type> lit_input(::boost::as_literal(Input));
+ iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range2T>::type> lit_test(::boost::as_literal(Test));
 
             typedef BOOST_STRING_TYPENAME
                 range_const_iterator<Range1T>::type Iterator1T;
@@ -92,7 +92,7 @@
             const Range1T& Input,
             const Range2T& Test)
         {
- return starts_with(Input, Test, is_equal());
+ return ::boost::algorithm::starts_with(Input, Test, is_equal());
         }
 
         //! 'Starts with' predicate ( case insensitive )
@@ -114,7 +114,7 @@
             const Range2T& Test,
             const std::locale& Loc=std::locale())
         {
- return starts_with(Input, Test, is_iequal(Loc));
+ return ::boost::algorithm::starts_with(Input, Test, is_iequal(Loc));
         }
 
 
@@ -141,8 +141,8 @@
             const Range2T& Test,
             PredicateT Comp)
         {
- iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range1T>::type> lit_input(as_literal(Input));
- iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range2T>::type> lit_test(as_literal(Test));
+ iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range1T>::type> lit_input(::boost::as_literal(Input));
+ iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range2T>::type> lit_test(::boost::as_literal(Test));
 
             typedef BOOST_STRING_TYPENAME
                 range_const_iterator<Range1T>::type Iterator1T;
@@ -169,7 +169,7 @@
             const Range1T& Input,
             const Range2T& Test)
         {
- return ends_with(Input, Test, is_equal());
+ return ::boost::algorithm::ends_with(Input, Test, is_equal());
         }
 
         //! 'Ends with' predicate ( case insensitive )
@@ -191,7 +191,7 @@
             const Range2T& Test,
             const std::locale& Loc=std::locale())
         {
- return ends_with(Input, Test, is_iequal(Loc));
+ return ::boost::algorithm::ends_with(Input, Test, is_iequal(Loc));
         }
 
 // contains predicate -----------------------------------------------//
@@ -215,17 +215,17 @@
             const Range2T& Test,
             PredicateT Comp)
         {
- iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range1T>::type> lit_input(as_literal(Input));
- iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range2T>::type> lit_test(as_literal(Test));
+ iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range1T>::type> lit_input(::boost::as_literal(Input));
+ iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range2T>::type> lit_test(::boost::as_literal(Test));
 
- if (empty(lit_test))
+ if (::boost::empty(lit_test))
             {
                 // Empty range is contained always
                 return true;
             }
             
             // Use the temporary variable to make VACPP happy
- bool bResult=(first_finder(lit_test,Comp)(::boost::begin(lit_input), ::boost::end(lit_input)));
+ bool bResult=(::boost::algorithm::first_finder(lit_test,Comp)(::boost::begin(lit_input), ::boost::end(lit_input)));
             return bResult;
         }
 
@@ -238,7 +238,7 @@
             const Range1T& Input,
             const Range2T& Test)
         {
- return contains(Input, Test, is_equal());
+ return ::boost::algorithm::contains(Input, Test, is_equal());
         }
 
         //! 'Contains' predicate ( case insensitive )
@@ -259,7 +259,7 @@
             const Range2T& Test,
             const std::locale& Loc=std::locale())
         {
- return contains(Input, Test, is_iequal(Loc));
+ return ::boost::algorithm::contains(Input, Test, is_iequal(Loc));
         }
 
 // equals predicate -----------------------------------------------//
@@ -286,8 +286,8 @@
             const Range2T& Test,
             PredicateT Comp)
         {
- iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range1T>::type> lit_input(as_literal(Input));
- iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range2T>::type> lit_test(as_literal(Test));
+ iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range1T>::type> lit_input(::boost::as_literal(Input));
+ iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range2T>::type> lit_test(::boost::as_literal(Test));
 
             typedef BOOST_STRING_TYPENAME
                 range_const_iterator<Range1T>::type Iterator1T;
@@ -319,7 +319,7 @@
             const Range1T& Input,
             const Range2T& Test)
         {
- return equals(Input, Test, is_equal());
+ return ::boost::algorithm::equals(Input, Test, is_equal());
         }
 
         //! 'Equals' predicate ( case insensitive )
@@ -343,7 +343,7 @@
             const Range2T& Test,
             const std::locale& Loc=std::locale())
         {
- return equals(Input, Test, is_iequal(Loc));
+ return ::boost::algorithm::equals(Input, Test, is_iequal(Loc));
         }
 
 // lexicographical_compare predicate -----------------------------//
@@ -372,8 +372,8 @@
             const Range2T& Arg2,
             PredicateT Pred)
         {
- iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range1T>::type> lit_arg1(as_literal(Arg1));
- iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range2T>::type> lit_arg2(as_literal(Arg2));
+ iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range1T>::type> lit_arg1(::boost::as_literal(Arg1));
+ iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range2T>::type> lit_arg2(::boost::as_literal(Arg2));
 
             return std::lexicographical_compare(
                 ::boost::begin(lit_arg1),
@@ -392,7 +392,7 @@
             const Range1T& Arg1,
             const Range2T& Arg2)
         {
- return lexicographical_compare(Arg1, Arg2, is_less());
+ return ::boost::algorithm::lexicographical_compare(Arg1, Arg2, is_less());
         }
 
         //! Lexicographical compare predicate (case-insensitive)
@@ -417,7 +417,7 @@
             const Range2T& Arg2,
             const std::locale& Loc=std::locale())
         {
- return lexicographical_compare(Arg1, Arg2, is_iless(Loc));
+ return ::boost::algorithm::lexicographical_compare(Arg1, Arg2, is_iless(Loc));
         }
         
 
@@ -439,7 +439,7 @@
             const RangeT& Input,
             PredicateT Pred)
         {
- iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_input(as_literal(Input));
+ iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_input(::boost::as_literal(Input));
 
             typedef BOOST_STRING_TYPENAME
                 range_const_iterator<RangeT>::type Iterator1T;

Modified: trunk/boost/algorithm/string/regex.hpp
==============================================================================
--- trunk/boost/algorithm/string/regex.hpp (original)
+++ trunk/boost/algorithm/string/regex.hpp 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -60,9 +60,9 @@
             const basic_regex<CharT, RegexTraitsT>& Rx,
             match_flag_type Flags=match_default )
         {
- iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_input(as_literal(Input));
+ iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_input(::boost::as_literal(Input));
 
- return regex_finder(Rx,Flags)(
+ return ::boost::algorithm::regex_finder(Rx,Flags)(
                 ::boost::begin(lit_input), ::boost::end(lit_input) );
         }
 
@@ -98,11 +98,11 @@
             const std::basic_string<CharT, FormatStringTraitsT, FormatStringAllocatorT>& Format,
             match_flag_type Flags=match_default | format_default )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Output,
                 Input,
- regex_finder( Rx, Flags ),
- regex_formatter( Format, Flags ) );
+ ::boost::algorithm::regex_finder( Rx, Flags ),
+ ::boost::algorithm::regex_formatter( Format, Flags ) );
         }
 
         //! Replace regex algorithm
@@ -120,10 +120,10 @@
             const std::basic_string<CharT, FormatStringTraitsT, FormatStringAllocatorT>& Format,
             match_flag_type Flags=match_default | format_default )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Input,
- regex_finder( Rx, Flags ),
- regex_formatter( Format, Flags ) );
+ ::boost::algorithm::regex_finder( Rx, Flags ),
+ ::boost::algorithm::regex_formatter( Format, Flags ) );
         }
 
         //! Replace regex algorithm
@@ -147,10 +147,10 @@
             const std::basic_string<CharT, FormatStringTraitsT, FormatStringAllocatorT>& Format,
             match_flag_type Flags=match_default | format_default )
         {
- find_format(
+ ::boost::algorithm::find_format(
                 Input,
- regex_finder( Rx, Flags ),
- regex_formatter( Format, Flags ) );
+ ::boost::algorithm::regex_finder( Rx, Flags ),
+ ::boost::algorithm::regex_formatter( Format, Flags ) );
         }
 
 // replace_all_regex --------------------------------------------------------------------//
@@ -184,11 +184,11 @@
             const std::basic_string<CharT, FormatStringTraitsT, FormatStringAllocatorT>& Format,
             match_flag_type Flags=match_default | format_default )
         {
- return find_format_all_copy(
+ return ::boost::algorithm::find_format_all_copy(
                 Output,
                 Input,
- regex_finder( Rx, Flags ),
- regex_formatter( Format, Flags ) );
+ ::boost::algorithm::regex_finder( Rx, Flags ),
+ ::boost::algorithm::regex_formatter( Format, Flags ) );
         }
 
         //! Replace all regex algorithm
@@ -206,10 +206,10 @@
             const std::basic_string<CharT, FormatStringTraitsT, FormatStringAllocatorT>& Format,
             match_flag_type Flags=match_default | format_default )
         {
- return find_format_all_copy(
+ return ::boost::algorithm::find_format_all_copy(
                 Input,
- regex_finder( Rx, Flags ),
- regex_formatter( Format, Flags ) );
+ ::boost::algorithm::regex_finder( Rx, Flags ),
+ ::boost::algorithm::regex_formatter( Format, Flags ) );
         }
 
         //! Replace all regex algorithm
@@ -233,10 +233,10 @@
             const std::basic_string<CharT, FormatStringTraitsT, FormatStringAllocatorT>& Format,
             match_flag_type Flags=match_default | format_default )
         {
- find_format_all(
+ ::boost::algorithm::find_format_all(
                 Input,
- regex_finder( Rx, Flags ),
- regex_formatter( Format, Flags ) );
+ ::boost::algorithm::regex_finder( Rx, Flags ),
+ ::boost::algorithm::regex_formatter( Format, Flags ) );
         }
 
 // erase_regex --------------------------------------------------------------------//
@@ -267,11 +267,11 @@
             const basic_regex<CharT, RegexTraitsT>& Rx,
             match_flag_type Flags=match_default )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Output,
                 Input,
- regex_finder( Rx, Flags ),
- empty_formatter( Input ) );
+ ::boost::algorithm::regex_finder( Rx, Flags ),
+ ::boost::algorithm::empty_formatter( Input ) );
         }
 
         //! Erase regex algorithm
@@ -287,10 +287,10 @@
             const basic_regex<CharT, RegexTraitsT>& Rx,
             match_flag_type Flags=match_default )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Input,
- regex_finder( Rx, Flags ),
- empty_formatter( Input ) );
+ ::boost::algorithm::regex_finder( Rx, Flags ),
+ ::boost::algorithm::empty_formatter( Input ) );
         }
 
         //! Erase regex algorithm
@@ -311,10 +311,10 @@
             const basic_regex<CharT, RegexTraitsT>& Rx,
             match_flag_type Flags=match_default )
         {
- find_format(
+ ::boost::algorithm::find_format(
                 Input,
- regex_finder( Rx, Flags ),
- empty_formatter( Input ) );
+ ::boost::algorithm::regex_finder( Rx, Flags ),
+ ::boost::algorithm::empty_formatter( Input ) );
         }
 
 // erase_all_regex --------------------------------------------------------------------//
@@ -346,11 +346,11 @@
             const basic_regex<CharT, RegexTraitsT>& Rx,
             match_flag_type Flags=match_default )
         {
- return find_format_all_copy(
+ return ::boost::algorithm::find_format_all_copy(
                 Output,
                 Input,
- regex_finder( Rx, Flags ),
- empty_formatter( Input ) );
+ ::boost::algorithm::regex_finder( Rx, Flags ),
+ ::boost::algorithm::empty_formatter( Input ) );
         }
 
         //! Erase all regex algorithm
@@ -366,10 +366,10 @@
             const basic_regex<CharT, RegexTraitsT>& Rx,
             match_flag_type Flags=match_default )
         {
- return find_format_all_copy(
+ return ::boost::algorithm::find_format_all_copy(
                 Input,
- regex_finder( Rx, Flags ),
- empty_formatter( Input ) );
+ ::boost::algorithm::regex_finder( Rx, Flags ),
+ ::boost::algorithm::empty_formatter( Input ) );
         }
 
         //! Erase all regex algorithm
@@ -390,10 +390,10 @@
             const basic_regex<CharT, RegexTraitsT>& Rx,
             match_flag_type Flags=match_default )
         {
- find_format_all(
+ ::boost::algorithm::find_format_all(
                 Input,
- regex_finder( Rx, Flags ),
- empty_formatter( Input ) );
+ ::boost::algorithm::regex_finder( Rx, Flags ),
+ ::boost::algorithm::empty_formatter( Input ) );
         }
 
 // find_all_regex ------------------------------------------------------------------//
@@ -431,10 +431,10 @@
             const basic_regex<CharT, RegexTraitsT>& Rx,
             match_flag_type Flags=match_default )
         {
- return iter_find(
+ return ::boost::algorithm::iter_find(
                 Result,
                 Input,
- regex_finder(Rx,Flags) );
+ ::boost::algorithm::regex_finder(Rx,Flags) );
         }
 
 // split_regex ------------------------------------------------------------------//
@@ -472,10 +472,10 @@
             const basic_regex<CharT, RegexTraitsT>& Rx,
             match_flag_type Flags=match_default )
         {
- return iter_split(
+ return ::boost::algorithm::iter_split(
                 Result,
                 Input,
- regex_finder(Rx,Flags) );
+ ::boost::algorithm::regex_finder(Rx,Flags) );
         }
 
 // join_if ------------------------------------------------------------------//
@@ -525,7 +525,7 @@
             // Roll to the first element that will be added
             while(
                 itBegin!=itEnd &&
- !regex_match(::boost::begin(*itBegin), ::boost::end(*itBegin), Rx, Flags)) ++itBegin;
+ !::boost::regex_match(::boost::begin(*itBegin), ::boost::end(*itBegin), Rx, Flags)) ++itBegin;
 
             // Add this element
             if(itBegin!=itEnd)
@@ -536,10 +536,10 @@
 
             for(;itBegin!=itEnd; ++itBegin)
             {
- if(regex_match(::boost::begin(*itBegin), ::boost::end(*itBegin), Rx, Flags))
+ if(::boost::regex_match(::boost::begin(*itBegin), ::boost::end(*itBegin), Rx, Flags))
                 {
                     // Add separator
- detail::insert(Result, ::boost::end(Result), as_literal(Separator));
+ detail::insert(Result, ::boost::end(Result), ::boost::as_literal(Separator));
                     // Add element
                     detail::insert(Result, ::boost::end(Result), *itBegin);
                 }
@@ -593,7 +593,7 @@
             // Roll to the first element that will be added
             while(
                 itBegin!=itEnd &&
- !regex_match(::boost::begin(*itBegin), ::boost::end(*itBegin), Rx, Flags)) ++itBegin;
+ !::boost::regex_match(::boost::begin(*itBegin), ::boost::end(*itBegin), Rx, Flags)) ++itBegin;
 
             // Add this element
             if(itBegin!=itEnd)
@@ -604,10 +604,10 @@
 
             for(;itBegin!=itEnd; ++itBegin)
             {
- if(regex_match(::boost::begin(*itBegin), ::boost::end(*itBegin), Rx, Flags))
+ if(::boost::regex_match(::boost::begin(*itBegin), ::boost::end(*itBegin), Rx, Flags))
                 {
                     // Add separator
- detail::insert(Result, ::boost::end(Result), as_literal(Separator));
+ detail::insert(Result, ::boost::end(Result), ::boost::as_literal(Separator));
                     // Add element
                     detail::insert(Result, ::boost::end(Result), *itBegin);
                 }

Modified: trunk/boost/algorithm/string/replace.hpp
==============================================================================
--- trunk/boost/algorithm/string/replace.hpp (original)
+++ trunk/boost/algorithm/string/replace.hpp 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -61,11 +61,11 @@
                     range_const_iterator<Range1T>::type>& SearchRange,
             const Range2T& Format)
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Output,
                 Input,
- range_finder(SearchRange),
- const_formatter(Format));
+ ::boost::algorithm::range_finder(SearchRange),
+ ::boost::algorithm::const_formatter(Format));
         }
 
         //! Replace range algorithm
@@ -80,10 +80,10 @@
                     range_const_iterator<SequenceT>::type>& SearchRange,
             const RangeT& Format)
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Input,
- range_finder(SearchRange),
- const_formatter(Format));
+ ::boost::algorithm::range_finder(SearchRange),
+ ::boost::algorithm::const_formatter(Format));
         }
 
         //! Replace range algorithm
@@ -103,10 +103,10 @@
                     range_iterator<SequenceT>::type>& SearchRange,
             const RangeT& Format)
         {
- find_format(
+ ::boost::algorithm::find_format(
                 Input,
- range_finder(SearchRange),
- const_formatter(Format));
+ ::boost::algorithm::range_finder(SearchRange),
+ ::boost::algorithm::const_formatter(Format));
         }
 
 // replace_first --------------------------------------------------------------------//
@@ -138,11 +138,11 @@
             const Range2T& Search,
             const Range3T& Format)
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Output,
                 Input,
- first_finder(Search),
- const_formatter(Format) );
+ ::boost::algorithm::first_finder(Search),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
         //! Replace first algorithm
@@ -155,10 +155,10 @@
             const Range1T& Search,
             const Range2T& Format )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Input,
- first_finder(Search),
- const_formatter(Format) );
+ ::boost::algorithm::first_finder(Search),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
         //! Replace first algorithm
@@ -176,10 +176,10 @@
             const Range1T& Search,
             const Range2T& Format )
         {
- find_format(
+ ::boost::algorithm::find_format(
                 Input,
- first_finder(Search),
- const_formatter(Format) );
+ ::boost::algorithm::first_finder(Search),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
 // replace_first ( case insensitive ) ---------------------------------------------//
@@ -214,11 +214,11 @@
             const Range3T& Format,
             const std::locale& Loc=std::locale() )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Output,
                 Input,
- first_finder(Search, is_iequal(Loc)),
- const_formatter(Format) );
+ ::boost::algorithm::first_finder(Search, is_iequal(Loc)),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
         //! Replace first algorithm ( case insensitive )
@@ -232,10 +232,10 @@
             const Range1T& Format,
             const std::locale& Loc=std::locale() )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Input,
- first_finder(Search, is_iequal(Loc)),
- const_formatter(Format) );
+ ::boost::algorithm::first_finder(Search, is_iequal(Loc)),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
         //! Replace first algorithm ( case insensitive )
@@ -256,10 +256,10 @@
             const Range2T& Format,
             const std::locale& Loc=std::locale() )
         {
- find_format(
+ ::boost::algorithm::find_format(
                 Input,
- first_finder(Search, is_iequal(Loc)),
- const_formatter(Format) );
+ ::boost::algorithm::first_finder(Search, is_iequal(Loc)),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
 // replace_last --------------------------------------------------------------------//
@@ -291,11 +291,11 @@
             const Range2T& Search,
             const Range3T& Format )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Output,
                 Input,
- last_finder(Search),
- const_formatter(Format) );
+ ::boost::algorithm::last_finder(Search),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
         //! Replace last algorithm
@@ -308,10 +308,10 @@
             const Range1T& Search,
             const Range2T& Format )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Input,
- last_finder(Search),
- const_formatter(Format) );
+ ::boost::algorithm::last_finder(Search),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
         //! Replace last algorithm
@@ -329,10 +329,10 @@
             const Range1T& Search,
             const Range2T& Format )
         {
- find_format(
+ ::boost::algorithm::find_format(
                 Input,
- last_finder(Search),
- const_formatter(Format) );
+ ::boost::algorithm::last_finder(Search),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
 // replace_last ( case insensitive ) -----------------------------------------------//
@@ -367,11 +367,11 @@
             const Range3T& Format,
             const std::locale& Loc=std::locale() )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Output,
                 Input,
- last_finder(Search, is_iequal(Loc)),
- const_formatter(Format) );
+ ::boost::algorithm::last_finder(Search, is_iequal(Loc)),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
         //! Replace last algorithm ( case insensitive )
@@ -385,10 +385,10 @@
             const Range2T& Format,
             const std::locale& Loc=std::locale() )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Input,
- last_finder(Search, is_iequal(Loc)),
- const_formatter(Format) );
+ ::boost::algorithm::last_finder(Search, is_iequal(Loc)),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
         //! Replace last algorithm ( case insensitive )
@@ -410,10 +410,10 @@
             const Range2T& Format,
             const std::locale& Loc=std::locale() )
         {
- find_format(
+ ::boost::algorithm::find_format(
                 Input,
- last_finder(Search, is_iequal(Loc)),
- const_formatter(Format) );
+ ::boost::algorithm::last_finder(Search, is_iequal(Loc)),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
 // replace_nth --------------------------------------------------------------------//
@@ -448,11 +448,11 @@
             int Nth,
             const Range3T& Format )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Output,
                 Input,
- nth_finder(Search, Nth),
- const_formatter(Format) );
+ ::boost::algorithm::nth_finder(Search, Nth),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
         //! Replace nth algorithm
@@ -466,10 +466,10 @@
             int Nth,
             const Range2T& Format )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Input,
- nth_finder(Search, Nth),
- const_formatter(Format) );
+ ::boost::algorithm::nth_finder(Search, Nth),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
         //! Replace nth algorithm
@@ -490,10 +490,10 @@
             int Nth,
             const Range2T& Format )
         {
- find_format(
+ ::boost::algorithm::find_format(
                 Input,
- nth_finder(Search, Nth),
- const_formatter(Format) );
+ ::boost::algorithm::nth_finder(Search, Nth),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
 // replace_nth ( case insensitive ) -----------------------------------------------//
@@ -531,11 +531,11 @@
             const Range3T& Format,
             const std::locale& Loc=std::locale() )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Output,
                 Input,
- nth_finder(Search, Nth, is_iequal(Loc) ),
- const_formatter(Format) );
+ ::boost::algorithm::nth_finder(Search, Nth, is_iequal(Loc) ),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
         //! Replace nth algorithm ( case insensitive )
@@ -550,10 +550,10 @@
             const Range2T& Format,
             const std::locale& Loc=std::locale() )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Input,
- nth_finder(Search, Nth, is_iequal(Loc)),
- const_formatter(Format) );
+ ::boost::algorithm::nth_finder(Search, Nth, is_iequal(Loc)),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
         //! Replace nth algorithm ( case insensitive )
@@ -577,10 +577,10 @@
             const Range2T& Format,
             const std::locale& Loc=std::locale() )
         {
- find_format(
+ ::boost::algorithm::find_format(
                 Input,
- nth_finder(Search, Nth, is_iequal(Loc)),
- const_formatter(Format) );
+ ::boost::algorithm::nth_finder(Search, Nth, is_iequal(Loc)),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
 // replace_all --------------------------------------------------------------------//
@@ -612,11 +612,11 @@
             const Range2T& Search,
             const Range3T& Format )
         {
- return find_format_all_copy(
+ return ::boost::algorithm::find_format_all_copy(
                 Output,
                 Input,
- first_finder(Search),
- const_formatter(Format) );
+ ::boost::algorithm::first_finder(Search),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
         //! Replace all algorithm
@@ -629,10 +629,10 @@
             const Range1T& Search,
             const Range2T& Format )
         {
- return find_format_all_copy(
+ return ::boost::algorithm::find_format_all_copy(
                 Input,
- first_finder(Search),
- const_formatter(Format) );
+ ::boost::algorithm::first_finder(Search),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
         //! Replace all algorithm
@@ -651,10 +651,10 @@
             const Range1T& Search,
             const Range2T& Format )
         {
- find_format_all(
+ ::boost::algorithm::find_format_all(
                 Input,
- first_finder(Search),
- const_formatter(Format) );
+ ::boost::algorithm::first_finder(Search),
+ ::boost::algorithm::const_formatter(Format) );
         }
         
 // replace_all ( case insensitive ) -----------------------------------------------//
@@ -689,11 +689,11 @@
             const Range3T& Format,
             const std::locale& Loc=std::locale() )
         {
- return find_format_all_copy(
+ return ::boost::algorithm::find_format_all_copy(
                 Output,
                 Input,
- first_finder(Search, is_iequal(Loc)),
- const_formatter(Format) );
+ ::boost::algorithm::first_finder(Search, is_iequal(Loc)),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
         //! Replace all algorithm ( case insensitive )
@@ -707,10 +707,10 @@
             const Range2T& Format,
             const std::locale& Loc=std::locale() )
         {
- return find_format_all_copy(
+ return ::boost::algorithm::find_format_all_copy(
                 Input,
- first_finder(Search, is_iequal(Loc)),
- const_formatter(Format) );
+ ::boost::algorithm::first_finder(Search, is_iequal(Loc)),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
         //! Replace all algorithm ( case insensitive )
@@ -731,10 +731,10 @@
             const Range2T& Format,
             const std::locale& Loc=std::locale() )
         {
- find_format_all(
+ ::boost::algorithm::find_format_all(
                 Input,
- first_finder(Search, is_iequal(Loc)),
- const_formatter(Format) );
+ ::boost::algorithm::first_finder(Search, is_iequal(Loc)),
+ ::boost::algorithm::const_formatter(Format) );
         }
         
 // replace_head --------------------------------------------------------------------//
@@ -769,11 +769,11 @@
             int N,
             const Range2T& Format )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Output,
                 Input,
- head_finder(N),
- const_formatter(Format) );
+ ::boost::algorithm::head_finder(N),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
         //! Replace head algorithm
@@ -786,10 +786,10 @@
             int N,
             const RangeT& Format )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Input,
- head_finder(N),
- const_formatter(Format) );
+ ::boost::algorithm::head_finder(N),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
         //! Replace head algorithm
@@ -811,10 +811,10 @@
             int N,
             const RangeT& Format )
         {
- find_format(
+ ::boost::algorithm::find_format(
                 Input,
- head_finder(N),
- const_formatter(Format) );
+ ::boost::algorithm::head_finder(N),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
 // replace_tail --------------------------------------------------------------------//
@@ -849,11 +849,11 @@
             int N,
             const Range2T& Format )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Output,
                 Input,
- tail_finder(N),
- const_formatter(Format) );
+ ::boost::algorithm::tail_finder(N),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
         //! Replace tail algorithm
@@ -866,10 +866,10 @@
             int N,
             const RangeT& Format )
         {
- return find_format_copy(
+ return ::boost::algorithm::find_format_copy(
                 Input,
- tail_finder(N),
- const_formatter(Format) );
+ ::boost::algorithm::tail_finder(N),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
         //! Replace tail algorithm
@@ -891,10 +891,10 @@
             int N,
             const RangeT& Format )
         {
- find_format(
+ ::boost::algorithm::find_format(
                 Input,
- tail_finder(N),
- const_formatter(Format) );
+ ::boost::algorithm::tail_finder(N),
+ ::boost::algorithm::const_formatter(Format) );
         }
 
     } // namespace algorithm

Modified: trunk/boost/algorithm/string/split.hpp
==============================================================================
--- trunk/boost/algorithm/string/split.hpp (original)
+++ trunk/boost/algorithm/string/split.hpp 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -64,10 +64,10 @@
             Range1T& Input,
             const Range2T& Search)
         {
- return iter_find(
+ return ::boost::algorithm::iter_find(
                 Result,
                 Input,
- first_finder(Search) );
+ ::boost::algorithm::first_finder(Search) );
         }
 
         //! Find all algorithm ( case insensitive )
@@ -100,10 +100,10 @@
             const Range2T& Search,
             const std::locale& Loc=std::locale() )
         {
- return iter_find(
+ return ::boost::algorithm::iter_find(
                 Result,
                 Input,
- first_finder(Search, is_iequal(Loc) ) );
+ ::boost::algorithm::first_finder(Search, is_iequal(Loc) ) );
         }
 
 
@@ -143,10 +143,10 @@
             PredicateT Pred,
             token_compress_mode_type eCompress=token_compress_off )
         {
- return iter_split(
+ return ::boost::algorithm::iter_split(
                 Result,
                 Input,
- token_finder( Pred, eCompress ) );
+ ::boost::algorithm::token_finder( Pred, eCompress ) );
         }
 
     } // namespace algorithm

Modified: trunk/boost/algorithm/string/trim.hpp
==============================================================================
--- trunk/boost/algorithm/string/trim.hpp (original)
+++ trunk/boost/algorithm/string/trim.hpp 2009-08-05 16:01:10 EDT (Wed, 05 Aug 2009)
@@ -63,7 +63,7 @@
             const RangeT& Input,
             PredicateT IsSpace)
         {
- iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_range(as_literal(Input));
+ iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_range(::boost::as_literal(Input));
 
             std::copy(
                 ::boost::algorithm::detail::trim_begin(
@@ -106,7 +106,7 @@
         inline SequenceT trim_left_copy(const SequenceT& Input, const std::locale& Loc=std::locale())
         {
             return
- trim_left_copy_if(
+ ::boost::algorithm::trim_left_copy_if(
                     Input,
                     is_space(Loc));
         }
@@ -142,7 +142,7 @@
         template<typename SequenceT>
         inline void trim_left(SequenceT& Input, const std::locale& Loc=std::locale())
         {
- trim_left_if(
+ ::boost::algorithm::trim_left_if(
                 Input,
                 is_space(Loc));
         }
@@ -171,7 +171,7 @@
             const RangeT& Input,
             PredicateT IsSpace )
         {
- iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_range(as_literal(Input));
+ iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_range(::boost::as_literal(Input));
          
             std::copy(
                 ::boost::begin(lit_range),
@@ -215,7 +215,7 @@
         inline SequenceT trim_right_copy(const SequenceT& Input, const std::locale& Loc=std::locale())
         {
             return
- trim_right_copy_if(
+ ::boost::algorithm::trim_right_copy_if(
                     Input,
                     is_space(Loc));
         }
@@ -254,7 +254,7 @@
         template<typename SequenceT>
         inline void trim_right(SequenceT& Input, const std::locale& Loc=std::locale())
         {
- trim_right_if(
+ ::boost::algorithm::trim_right_if(
                 Input,
                 is_space(Loc) );
         }
@@ -283,7 +283,7 @@
             const RangeT& Input,
             PredicateT IsSpace)
         {
- iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_range(as_literal(Input));
+ iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_range(::boost::as_literal(Input));
 
             BOOST_STRING_TYPENAME
                 range_const_iterator<RangeT>::type TrimEnd=
@@ -340,7 +340,7 @@
         inline SequenceT trim_copy( const SequenceT& Input, const std::locale& Loc=std::locale() )
         {
             return
- trim_copy_if(
+ ::boost::algorithm::trim_copy_if(
                     Input,
                     is_space(Loc) );
         }
@@ -357,8 +357,8 @@
         template<typename SequenceT, typename PredicateT>
         inline void trim_if(SequenceT& Input, PredicateT IsSpace)
         {
- trim_right_if( Input, IsSpace );
- trim_left_if( Input, IsSpace );
+ ::boost::algorithm::trim_right_if( Input, IsSpace );
+ ::boost::algorithm::trim_left_if( Input, IsSpace );
         }
 
         //! Trim
@@ -372,7 +372,7 @@
         template<typename SequenceT>
         inline void trim(SequenceT& Input, const std::locale& Loc=std::locale())
         {
- trim_if(
+ ::boost::algorithm::trim_if(
                 Input,
                 is_space( Loc ) );
         }


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk