feedc0de/boost_algorithm
1
0
Fork 0
forked from boostorg/algorithm
Code Pull Requests Activity

Merged ADL protection patch from Neil Groves

Browse Source 
[SVN r55424]
This commit is contained in:
Pavol Droba
2009-08-05 20:01:10 +00:00
parent 236b142308
commit e439792494
24 changed files with 406 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,10 +105,10 @@ namespace boost {
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));
}

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

@ -35,7 +35,7 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
FormatterT Formatter,
const FindResultT& FindResult)
{
find_format_impl2(
::boost::algorithm::detail::find_format_impl2(
Input,
Formatter,
FindResult,
@ -183,7 +183,7 @@ namespace boost {
}
// 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

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

@ -37,7 +37,7 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
}
// 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 @@ namespace boost {
FormatterT Formatter,
FindResultT FindResult)
{
find_format_all_impl2(
::boost::algorithm::detail::find_format_all_impl2(
Input,
Finder,
Formatter,
@ -230,14 +230,14 @@ namespace boost {
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 @@ namespace boost {
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() );
}
}

16
include/boost/algorithm/string/detail/finder.hpp
View File

@ -382,7 +382,7 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
{
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 @@ namespace boost {
{
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);
}
}

2
include/boost/algorithm/string/detail/finder_regex.hpp
View File

@ -98,7 +98,7 @@ namespace boost {
// 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 );

2
include/boost/algorithm/string/detail/predicate.hpp
View File

@ -63,7 +63,7 @@ namespace boost {
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;

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

@ -68,7 +68,7 @@ namespace boost {
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 @@ namespace boost {
{
// 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

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

@ -41,7 +41,7 @@ namespace boost {
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 @@ namespace boost {
{
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) );
}
}

2
include/boost/algorithm/string/detail/trim.hpp
View File

@ -47,7 +47,7 @@ namespace boost {
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 >