Merged ADL protection patch from Neil Groves

[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

View File

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