From 9fa2f90db45839bb776cd9175d047e8f243658a1 Mon Sep 17 00:00:00 2001 From: Pavol Droba Date: Tue, 17 Jun 2008 21:04:00 +0000 Subject: [PATCH] begin() and end() calls made fully qualified [SVN r46459] --- include/boost/algorithm/string/concept.hpp | 4 +- .../algorithm/string/detail/case_conv.hpp | 14 +++--- .../string/detail/classification.hpp | 2 +- .../algorithm/string/detail/find_format.hpp | 14 +++--- .../string/detail/find_format_all.hpp | 30 ++++++------ .../boost/algorithm/string/detail/finder.hpp | 12 ++--- .../algorithm/string/detail/formatter.hpp | 4 +- .../string/detail/replace_storage.hpp | 2 +- .../algorithm/string/detail/sequence.hpp | 6 +-- include/boost/algorithm/string/find.hpp | 2 +- .../boost/algorithm/string/find_format.hpp | 12 ++--- .../boost/algorithm/string/find_iterator.hpp | 12 ++--- include/boost/algorithm/string/iter_find.hpp | 8 ++-- include/boost/algorithm/string/join.hpp | 20 ++++---- include/boost/algorithm/string/predicate.hpp | 38 +++++++-------- include/boost/algorithm/string/regex.hpp | 30 ++++++------ include/boost/algorithm/string/trim.hpp | 48 +++++++++---------- 17 files changed, 129 insertions(+), 129 deletions(-) diff --git a/include/boost/algorithm/string/concept.hpp b/include/boost/algorithm/string/concept.hpp index 3ebc88c..9876e98 100644 --- a/include/boost/algorithm/string/concept.hpp +++ b/include/boost/algorithm/string/concept.hpp @@ -65,8 +65,8 @@ namespace boost { void constraints() { // Operation - begin((*pFo)( (*pF)(i,i) )); - end((*pFo)( (*pF)(i,i) )); + ::boost::begin((*pFo)( (*pF)(i,i) )); + ::boost::end((*pFo)( (*pF)(i,i) )); } private: IteratorT i; diff --git a/include/boost/algorithm/string/detail/case_conv.hpp b/include/boost/algorithm/string/detail/case_conv.hpp index 0eaad19..ef1d4aa 100644 --- a/include/boost/algorithm/string/detail/case_conv.hpp +++ b/include/boost/algorithm/string/detail/case_conv.hpp @@ -71,8 +71,8 @@ namespace boost { FunctorT Functor) { return std::transform( - begin(Input), - end(Input), + ::boost::begin(Input), + ::boost::end(Input), Output, Functor); } @@ -84,9 +84,9 @@ namespace boost { FunctorT Functor) { std::transform( - begin(Input), - end(Input), - begin(Input), + ::boost::begin(Input), + ::boost::end(Input), + ::boost::begin(Input), Functor); } @@ -97,10 +97,10 @@ namespace boost { { return SequenceT( make_transform_iterator( - begin(Input), + ::boost::begin(Input), Functor), make_transform_iterator( - end(Input), + ::boost::end(Input), Functor)); } diff --git a/include/boost/algorithm/string/detail/classification.hpp b/include/boost/algorithm/string/detail/classification.hpp index d3139ad..4e77070 100644 --- a/include/boost/algorithm/string/detail/classification.hpp +++ b/include/boost/algorithm/string/detail/classification.hpp @@ -74,7 +74,7 @@ namespace boost { // Constructor template is_any_ofF( const RangeT& Range ) : - m_Set( begin(Range), end(Range) ) {} + m_Set( ::boost::begin(Range), ::boost::end(Range) ) {} // Operation template diff --git a/include/boost/algorithm/string/detail/find_format.hpp b/include/boost/algorithm/string/detail/find_format.hpp index f1dcc0c..8fb625e 100644 --- a/include/boost/algorithm/string/detail/find_format.hpp +++ b/include/boost/algorithm/string/detail/find_format.hpp @@ -68,17 +68,17 @@ namespace boost { if ( !M ) { // Match not found - return original sequence - std::copy( begin(Input), end(Input), Output ); + std::copy( ::boost::begin(Input), ::boost::end(Input), Output ); return Output; } // Copy the beginning of the sequence - std::copy( begin(Input), begin(M), Output ); + std::copy( ::boost::begin(Input), ::boost::begin(M), Output ); // Format find result // Copy formated result - std::copy( begin(M.format_result()), end(M.format_result()), Output ); + std::copy( ::boost::begin(M.format_result()), ::boost::end(M.format_result()), Output ); // Copy the rest of the sequence - std::copy( M.end(), end(Input), Output ); + std::copy( M.end(), ::boost::end(Input), Output ); return Output; } @@ -129,11 +129,11 @@ namespace boost { InputT Output; // Copy the beginning of the sequence - insert( Output, end(Output), begin(Input), M.begin() ); + insert( Output, ::boost::end(Output), ::boost::begin(Input), M.begin() ); // Copy formated result - insert( Output, end(Output), M.format_result() ); + insert( Output, ::boost::end(Output), M.format_result() ); // Copy the rest of the sequence - insert( Output, end(Output), M.end(), end(Input) ); + insert( Output, ::boost::end(Output), M.end(), ::boost::end(Input) ); return Output; } diff --git a/include/boost/algorithm/string/detail/find_format_all.hpp b/include/boost/algorithm/string/detail/find_format_all.hpp index 28c60b8..9533be6 100644 --- a/include/boost/algorithm/string/detail/find_format_all.hpp +++ b/include/boost/algorithm/string/detail/find_format_all.hpp @@ -73,7 +73,7 @@ namespace boost { store_type M( FindResult, FormatResult, Formatter ); // Initialize last match - input_iterator_type LastMatch=begin(Input); + input_iterator_type LastMatch=::boost::begin(Input); // Iterate through all matches while( M ) @@ -81,15 +81,15 @@ namespace boost { // Copy the beginning of the sequence std::copy( LastMatch, M.begin(), Output ); // Copy formated result - std::copy( begin(M.format_result()), end(M.format_result()), Output ); + std::copy( ::boost::begin(M.format_result()), ::boost::end(M.format_result()), Output ); // Proceed to the next match LastMatch=M.end(); - M=Finder( LastMatch, end(Input) ); + M=Finder( LastMatch, ::boost::end(Input) ); } // Copy the rest of the sequence - std::copy( LastMatch, end(Input), Output ); + std::copy( LastMatch, ::boost::end(Input), Output ); return Output; } @@ -140,7 +140,7 @@ namespace boost { store_type M( FindResult, FormatResult, Formatter ); // Initialize last match - input_iterator_type LastMatch=begin(Input); + input_iterator_type LastMatch=::boost::begin(Input); // Output temporary InputT Output; @@ -149,17 +149,17 @@ namespace boost { while( M ) { // Copy the beginning of the sequence - insert( Output, end(Output), LastMatch, M.begin() ); + insert( Output, ::boost::end(Output), LastMatch, M.begin() ); // Copy formated result - insert( Output, end(Output), M.format_result() ); + insert( Output, ::boost::end(Output), M.format_result() ); // Proceed to the next match LastMatch=M.end(); - M=Finder( LastMatch, end(Input) ); + M=Finder( LastMatch, ::boost::end(Input) ); } // Copy the rest of the sequence - insert( Output, end(Output), LastMatch, end(Input) ); + insert( Output, ::boost::end(Output), LastMatch, ::boost::end(Input) ); return Output; } @@ -213,8 +213,8 @@ namespace boost { BOOST_STRING_TYPENAME range_value::type> Storage; // Initialize replacement iterators - input_iterator_type InsertIt=begin(Input); - input_iterator_type SearchIt=begin(Input); + input_iterator_type InsertIt=::boost::begin(Input); + input_iterator_type SearchIt=::boost::begin(Input); while( M ) { @@ -233,7 +233,7 @@ namespace boost { copy_to_storage( Storage, M.format_result() ); // Find range for a next match - M=Finder( SearchIt, end(Input) ); + M=Finder( SearchIt, ::boost::end(Input) ); } // process the last segment @@ -242,17 +242,17 @@ namespace boost { Input, InsertIt, SearchIt, - end(Input) ); + ::boost::end(Input) ); if ( Storage.empty() ) { // Truncate input - erase( Input, InsertIt, end(Input) ); + erase( Input, InsertIt, ::boost::end(Input) ); } else { // Copy remaining data to the end of input - insert( Input, end(Input), Storage.begin(), Storage.end() ); + insert( Input, ::boost::end(Input), Storage.begin(), Storage.end() ); } } diff --git a/include/boost/algorithm/string/detail/finder.hpp b/include/boost/algorithm/string/detail/finder.hpp index 194296e..c6d0752 100644 --- a/include/boost/algorithm/string/detail/finder.hpp +++ b/include/boost/algorithm/string/detail/finder.hpp @@ -41,7 +41,7 @@ namespace boost { // Construction template< typename SearchT > first_finderF( const SearchT& Search, PredicateT Comp ) : - m_Search(begin(Search), end(Search)), m_Comp(Comp) {} + m_Search(::boost::begin(Search), ::boost::end(Search)), m_Comp(Comp) {} first_finderF( search_iterator_type SearchBegin, search_iterator_type SearchEnd, @@ -108,7 +108,7 @@ namespace boost { // Construction template< typename SearchT > last_finderF( const SearchT& Search, PredicateT Comp ) : - m_Search(begin(Search), end(Search)), m_Comp(Comp) {} + m_Search(::boost::begin(Search), ::boost::end(Search)), m_Comp(Comp) {} last_finderF( search_iterator_type SearchBegin, search_iterator_type SearchEnd, @@ -154,7 +154,7 @@ namespace boost { while( M ) { Last=M; - M=first_finder( end(M), End ); + M=first_finder( ::boost::end(M), End ); } return Last; @@ -224,7 +224,7 @@ namespace boost { const SearchT& Search, int Nth, PredicateT Comp) : - m_Search(begin(Search), end(Search)), + m_Search(::boost::begin(Search), ::boost::end(Search)), m_Nth(Nth), m_Comp(Comp) {} nth_finderF( @@ -279,7 +279,7 @@ namespace boost { for( unsigned int n=0; n<=N; ++n ) { // find next match - M=first_finder( end(M), End ); + M=first_finder( ::boost::end(M), End ); if ( !M ) { @@ -314,7 +314,7 @@ namespace boost { for( unsigned int n=1; n<=N; ++n ) { // find next match - M=last_finder( Begin, begin(M) ); + M=last_finder( Begin, ::boost::begin(M) ); if ( !M ) { diff --git a/include/boost/algorithm/string/detail/formatter.hpp b/include/boost/algorithm/string/detail/formatter.hpp index 2af1573..bd6a780 100644 --- a/include/boost/algorithm/string/detail/formatter.hpp +++ b/include/boost/algorithm/string/detail/formatter.hpp @@ -39,7 +39,7 @@ namespace boost { public: // Construction const_formatF(const RangeT& Format) : - m_Format(begin(Format), end(Format)) {} + m_Format(::boost::begin(Format), ::boost::end(Format)) {} // Operation #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) @@ -70,7 +70,7 @@ namespace boost { template< typename Range2T > const RangeT& operator()(const Range2T& Replace) const { - return RangeT(begin(Replace), end(Replace)); + return RangeT(::boost::begin(Replace), ::boost::end(Replace)); } }; diff --git a/include/boost/algorithm/string/detail/replace_storage.hpp b/include/boost/algorithm/string/detail/replace_storage.hpp index 759036e..7aff247 100644 --- a/include/boost/algorithm/string/detail/replace_storage.hpp +++ b/include/boost/algorithm/string/detail/replace_storage.hpp @@ -46,7 +46,7 @@ namespace boost { StorageT& Storage, const WhatT& What ) { - Storage.insert( Storage.end(), begin(What), end(What) ); + Storage.insert( Storage.end(), ::boost::begin(What), ::boost::end(What) ); } diff --git a/include/boost/algorithm/string/detail/sequence.hpp b/include/boost/algorithm/string/detail/sequence.hpp index 87d7eab..de01350 100644 --- a/include/boost/algorithm/string/detail/sequence.hpp +++ b/include/boost/algorithm/string/detail/sequence.hpp @@ -41,7 +41,7 @@ namespace boost { BOOST_STRING_TYPENAME InputT::iterator At, const InsertT& Insert ) { - insert( Input, At, begin(Insert), end(Insert) ); + insert( Input, At, ::boost::begin(Insert), ::boost::end(Insert) ); } // erase helper ---------------------------------------------------// @@ -184,11 +184,11 @@ namespace boost { { if(From!=To) { - replace( Input, From, To, begin(Insert), end(Insert) ); + replace( Input, From, To, ::boost::begin(Insert), ::boost::end(Insert) ); } else { - insert( Input, From, begin(Insert), end(Insert) ); + insert( Input, From, ::boost::begin(Insert), ::boost::end(Insert) ); } } diff --git a/include/boost/algorithm/string/find.hpp b/include/boost/algorithm/string/find.hpp index 1f7202d..8daada5 100644 --- a/include/boost/algorithm/string/find.hpp +++ b/include/boost/algorithm/string/find.hpp @@ -55,7 +55,7 @@ namespace boost { { iterator_range::type> lit_input(as_literal(Input)); - return Finder(begin(lit_input),end(lit_input)); + return Finder(::boost::begin(lit_input),::boost::end(lit_input)); } // find_first -----------------------------------------------// diff --git a/include/boost/algorithm/string/find_format.hpp b/include/boost/algorithm/string/find_format.hpp index cb3dd7c..453dfaf 100644 --- a/include/boost/algorithm/string/find_format.hpp +++ b/include/boost/algorithm/string/find_format.hpp @@ -76,7 +76,7 @@ namespace boost { Output, lit_input, Formatter, - Finder( begin(lit_input), end(lit_input) ) ); + Finder( ::boost::begin(lit_input), ::boost::end(lit_input) ) ); } //! Generic replace algorithm @@ -104,7 +104,7 @@ namespace boost { return detail::find_format_copy_impl( Input, Formatter, - Finder(begin(Input), end(Input))); + Finder(::boost::begin(Input), ::boost::end(Input))); } //! Generic replace algorithm @@ -137,7 +137,7 @@ namespace boost { detail::find_format_impl( Input, Formatter, - Finder(begin(Input), end(Input))); + Finder(::boost::begin(Input), ::boost::end(Input))); } @@ -187,7 +187,7 @@ namespace boost { lit_input, Finder, Formatter, - Finder(begin(lit_input), end(lit_input))); + Finder(::boost::begin(lit_input), ::boost::end(lit_input))); } //! Generic replace all algorithm @@ -216,7 +216,7 @@ namespace boost { Input, Finder, Formatter, - Finder( begin(Input), end(Input) ) ); + Finder( ::boost::begin(Input), ::boost::end(Input) ) ); } //! Generic replace all algorithm @@ -251,7 +251,7 @@ namespace boost { Input, Finder, Formatter, - Finder(begin(Input), end(Input))); + Finder(::boost::begin(Input), ::boost::end(Input))); } diff --git a/include/boost/algorithm/string/find_iterator.hpp b/include/boost/algorithm/string/find_iterator.hpp index 30a337c..211b87c 100644 --- a/include/boost/algorithm/string/find_iterator.hpp +++ b/include/boost/algorithm/string/find_iterator.hpp @@ -24,7 +24,7 @@ #include /*! \file - Defines find iterator classes. Find iterator repeatly applies a Finder + Defines find iterator classes. Find iterator repeatedly applies a Finder to the specified input string to search for matches. Dereferencing the iterator yields the current match or a range between the last and the current match depending on the iterator used. @@ -114,8 +114,8 @@ namespace boost { detail::find_iterator_base(Finder,0) { iterator_range::type> lit_col(as_literal(Col)); - m_Match=make_iterator_range(begin(lit_col), begin(lit_col)); - m_End=end(lit_col); + m_Match=make_iterator_range(::boost::begin(lit_col), ::boost::begin(lit_col)); + m_End=::boost::end(lit_col); increment(); } @@ -274,9 +274,9 @@ namespace boost { m_bEof(false) { iterator_range::type> lit_col(as_literal(Col)); - m_Match=make_iterator_range(begin(lit_col), begin(lit_col)); - m_Next=begin(lit_col); - m_End=end(lit_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); increment(); } diff --git a/include/boost/algorithm/string/iter_find.hpp b/include/boost/algorithm/string/iter_find.hpp index 73887a8..525109b 100644 --- a/include/boost/algorithm/string/iter_find.hpp +++ b/include/boost/algorithm/string/iter_find.hpp @@ -88,14 +88,14 @@ namespace boost { range_value::type, input_iterator_type> copy_range_type; - input_iterator_type InputEnd=end(lit_input); + input_iterator_type InputEnd=::boost::end(lit_input); typedef transform_iterator transform_iter_type; transform_iter_type itBegin= make_transform_iterator( - find_iterator_type( begin(lit_input), InputEnd, Finder ), + find_iterator_type( ::boost::begin(lit_input), InputEnd, Finder ), copy_range_type()); transform_iter_type itEnd= @@ -157,14 +157,14 @@ namespace boost { range_value::type, input_iterator_type> copy_range_type; - input_iterator_type InputEnd=end(lit_input); + input_iterator_type InputEnd=::boost::end(lit_input); typedef transform_iterator transform_iter_type; transform_iter_type itBegin= make_transform_iterator( - find_iterator_type( begin(lit_input), InputEnd, Finder ), + find_iterator_type( ::boost::begin(lit_input), InputEnd, Finder ), copy_range_type() ); transform_iter_type itEnd= diff --git a/include/boost/algorithm/string/join.hpp b/include/boost/algorithm/string/join.hpp index d2bc382..b215598 100644 --- a/include/boost/algorithm/string/join.hpp +++ b/include/boost/algorithm/string/join.hpp @@ -52,8 +52,8 @@ namespace boost { typedef typename range_const_iterator::type InputIteratorT; // Parse input - InputIteratorT itBegin=begin(Input); - InputIteratorT itEnd=end(Input); + InputIteratorT itBegin=::boost::begin(Input); + InputIteratorT itEnd=::boost::end(Input); // Construct container to hold the result ResultT Result; @@ -61,16 +61,16 @@ namespace boost { // Append first element if(itBegin!=itEnd) { - detail::insert(Result, end(Result), *itBegin); + detail::insert(Result, ::boost::end(Result), *itBegin); ++itBegin; } for(;itBegin!=itEnd; ++itBegin) { // Add separator - detail::insert(Result, end(Result), as_literal(Separator)); + detail::insert(Result, ::boost::end(Result), as_literal(Separator)); // Add element - detail::insert(Result, end(Result), *itBegin); + detail::insert(Result, ::boost::end(Result), *itBegin); } return Result; @@ -103,8 +103,8 @@ namespace boost { typedef typename range_const_iterator::type InputIteratorT; // Parse input - InputIteratorT itBegin=begin(Input); - InputIteratorT itEnd=end(Input); + InputIteratorT itBegin=::boost::begin(Input); + InputIteratorT itEnd=::boost::end(Input); // Construct container to hold the result ResultT Result; @@ -114,7 +114,7 @@ namespace boost { // Add this element if(itBegin!=itEnd) { - detail::insert(Result, end(Result), *itBegin); + detail::insert(Result, ::boost::end(Result), *itBegin); ++itBegin; } @@ -123,9 +123,9 @@ namespace boost { if(Pred(*itBegin)) { // Add separator - detail::insert(Result, end(Result), as_literal(Separator)); + detail::insert(Result, ::boost::end(Result), as_literal(Separator)); // Add element - detail::insert(Result, end(Result), *itBegin); + detail::insert(Result, ::boost::end(Result), *itBegin); } } diff --git a/include/boost/algorithm/string/predicate.hpp b/include/boost/algorithm/string/predicate.hpp index 4edd553..8b62086 100644 --- a/include/boost/algorithm/string/predicate.hpp +++ b/include/boost/algorithm/string/predicate.hpp @@ -67,11 +67,11 @@ namespace boost { typedef BOOST_STRING_TYPENAME range_const_iterator::type Iterator2T; - Iterator1T InputEnd=end(lit_input); - Iterator2T TestEnd=end(lit_test); + Iterator1T InputEnd=::boost::end(lit_input); + Iterator2T TestEnd=::boost::end(lit_test); - Iterator1T it=begin(lit_input); - Iterator2T pit=begin(lit_test); + Iterator1T it=::boost::begin(lit_input); + Iterator2T pit=::boost::begin(lit_test); for(; it!=InputEnd && pit!=TestEnd; ++it,++pit) @@ -151,10 +151,10 @@ namespace boost { return detail:: ends_with_iter_select( - begin(lit_input), - end(lit_input), - begin(lit_test), - end(lit_test), + ::boost::begin(lit_input), + ::boost::end(lit_input), + ::boost::begin(lit_test), + ::boost::end(lit_test), Comp, category()); } @@ -225,7 +225,7 @@ namespace boost { } // Use the temporary variable to make VACPP happy - bool bResult=(first_finder(lit_test,Comp)(begin(lit_input), end(lit_input))); + bool bResult=(first_finder(lit_test,Comp)(::boost::begin(lit_input), ::boost::end(lit_input))); return bResult; } @@ -294,11 +294,11 @@ namespace boost { typedef BOOST_STRING_TYPENAME range_const_iterator::type Iterator2T; - Iterator1T InputEnd=end(lit_input); - Iterator2T TestEnd=end(lit_test); + Iterator1T InputEnd=::boost::end(lit_input); + Iterator2T TestEnd=::boost::end(lit_test); - Iterator1T it=begin(lit_input); - Iterator2T pit=begin(lit_test); + Iterator1T it=::boost::begin(lit_input); + Iterator2T pit=::boost::begin(lit_test); for(; it!=InputEnd && pit!=TestEnd; ++it,++pit) @@ -376,10 +376,10 @@ namespace boost { iterator_range::type> lit_arg2(as_literal(Arg2)); return std::lexicographical_compare( - begin(lit_arg1), - end(lit_arg1), - begin(lit_arg2), - end(lit_arg2), + ::boost::begin(lit_arg1), + ::boost::end(lit_arg1), + ::boost::begin(lit_arg2), + ::boost::end(lit_arg2), Pred); } @@ -444,8 +444,8 @@ namespace boost { typedef BOOST_STRING_TYPENAME range_const_iterator::type Iterator1T; - Iterator1T InputEnd=end(lit_input); - for( Iterator1T It=begin(lit_input); It!=InputEnd; ++It) + Iterator1T InputEnd=::boost::end(lit_input); + for( Iterator1T It=::boost::begin(lit_input); It!=InputEnd; ++It) { if (!Pred(*It)) return false; diff --git a/include/boost/algorithm/string/regex.hpp b/include/boost/algorithm/string/regex.hpp index 98a0dfc..b723204 100644 --- a/include/boost/algorithm/string/regex.hpp +++ b/include/boost/algorithm/string/regex.hpp @@ -63,7 +63,7 @@ namespace boost { iterator_range::type> lit_input(as_literal(Input)); return regex_finder(Rx,Flags)( - begin(lit_input), end(lit_input) ); + ::boost::begin(lit_input), ::boost::end(lit_input) ); } // replace_regex --------------------------------------------------------------------// @@ -515,8 +515,8 @@ namespace boost { typedef typename range_const_iterator::type InputIteratorT; // Parse input - InputIteratorT itBegin=begin(Input); - InputIteratorT itEnd=end(Input); + InputIteratorT itBegin=::boost::begin(Input); + InputIteratorT itEnd=::boost::end(Input); // Construct container to hold the result ResultT Result; @@ -525,23 +525,23 @@ namespace boost { // Roll to the first element that will be added while( itBegin!=itEnd && - !regex_match(begin(*itBegin), end(*itBegin), Rx, Flags)) ++itBegin; + !regex_match(::boost::begin(*itBegin), ::boost::end(*itBegin), Rx, Flags)) ++itBegin; // Add this element if(itBegin!=itEnd) { - detail::insert(Result, end(Result), *itBegin); + detail::insert(Result, ::boost::end(Result), *itBegin); ++itBegin; } for(;itBegin!=itEnd; ++itBegin) { - if(regex_match(begin(*itBegin), end(*itBegin), Rx, Flags)) + if(regex_match(::boost::begin(*itBegin), ::boost::end(*itBegin), Rx, Flags)) { // Add separator - detail::insert(Result, end(Result), as_literal(Separator)); + detail::insert(Result, ::boost::end(Result), as_literal(Separator)); // Add element - detail::insert(Result, end(Result), *itBegin); + detail::insert(Result, ::boost::end(Result), *itBegin); } } @@ -583,8 +583,8 @@ namespace boost { typedef typename range_const_iterator::type InputIteratorT; // Parse input - InputIteratorT itBegin=begin(Input); - InputIteratorT itEnd=end(Input); + InputIteratorT itBegin=::boost::begin(Input); + InputIteratorT itEnd=::boost::end(Input); // Construct container to hold the result ResultT Result; @@ -593,23 +593,23 @@ namespace boost { // Roll to the first element that will be added while( itBegin!=itEnd && - !regex_match(begin(*itBegin), end(*itBegin), Rx, Flags)) ++itBegin; + !regex_match(::boost::begin(*itBegin), ::boost::end(*itBegin), Rx, Flags)) ++itBegin; // Add this element if(itBegin!=itEnd) { - detail::insert(Result, end(Result), *itBegin); + detail::insert(Result, ::boost::end(Result), *itBegin); ++itBegin; } for(;itBegin!=itEnd; ++itBegin) { - if(regex_match(begin(*itBegin), end(*itBegin), Rx, Flags)) + if(regex_match(::boost::begin(*itBegin), ::boost::end(*itBegin), Rx, Flags)) { // Add separator - detail::insert(Result, end(Result), as_literal(Separator)); + detail::insert(Result, ::boost::end(Result), as_literal(Separator)); // Add element - detail::insert(Result, end(Result), *itBegin); + detail::insert(Result, ::boost::end(Result), *itBegin); } } diff --git a/include/boost/algorithm/string/trim.hpp b/include/boost/algorithm/string/trim.hpp index b2bdc04..177ed1b 100644 --- a/include/boost/algorithm/string/trim.hpp +++ b/include/boost/algorithm/string/trim.hpp @@ -67,10 +67,10 @@ namespace boost { std::copy( ::boost::algorithm::detail::trim_begin( - begin(lit_range), - end(lit_range), + ::boost::begin(lit_range), + ::boost::end(lit_range), IsSpace ), - end(lit_range), + ::boost::end(lit_range), Output); return Output; @@ -85,10 +85,10 @@ namespace boost { { return SequenceT( ::boost::algorithm::detail::trim_begin( - begin(Input), - end(Input), + ::boost::begin(Input), + ::boost::end(Input), IsSpace ), - end(Input)); + ::boost::end(Input)); } //! Left trim - parametric @@ -124,10 +124,10 @@ namespace boost { inline void trim_left_if(SequenceT& Input, PredicateT IsSpace) { Input.erase( - begin(Input), + ::boost::begin(Input), ::boost::algorithm::detail::trim_begin( - begin(Input), - end(Input), + ::boost::begin(Input), + ::boost::end(Input), IsSpace)); } @@ -174,10 +174,10 @@ namespace boost { iterator_range::type> lit_range(as_literal(Input)); std::copy( - begin(lit_range), + ::boost::begin(lit_range), ::boost::algorithm::detail::trim_end( - begin(lit_range), - end(lit_range), + ::boost::begin(lit_range), + ::boost::end(lit_range), IsSpace ), Output ); @@ -192,10 +192,10 @@ namespace boost { inline SequenceT trim_right_copy_if(const SequenceT& Input, PredicateT IsSpace) { return SequenceT( - begin(Input), + ::boost::begin(Input), ::boost::algorithm::detail::trim_end( - begin(Input), - end(Input), + ::boost::begin(Input), + ::boost::end(Input), IsSpace) ); } @@ -235,10 +235,10 @@ namespace boost { { Input.erase( ::boost::algorithm::detail::trim_end( - begin(Input), - end(Input), + ::boost::begin(Input), + ::boost::end(Input), IsSpace ), - end(Input) + ::boost::end(Input) ); } @@ -288,13 +288,13 @@ namespace boost { BOOST_STRING_TYPENAME range_const_iterator::type TrimEnd= ::boost::algorithm::detail::trim_end( - begin(lit_range), - end(lit_range), + ::boost::begin(lit_range), + ::boost::end(lit_range), IsSpace); std::copy( detail::trim_begin( - begin(lit_range), TrimEnd, IsSpace), + ::boost::begin(lit_range), TrimEnd, IsSpace), TrimEnd, Output ); @@ -312,13 +312,13 @@ namespace boost { BOOST_STRING_TYPENAME range_const_iterator::type TrimEnd= ::boost::algorithm::detail::trim_end( - begin(Input), - end(Input), + ::boost::begin(Input), + ::boost::end(Input), IsSpace); return SequenceT( detail::trim_begin( - begin(Input), + ::boost::begin(Input), TrimEnd, IsSpace), TrimEnd