Merged changes from trunk

[SVN r56176]
This commit is contained in:
Pavol Droba
2009-09-13 19:10:55 +00:00
parent e7cd4da67b
commit 62ec675581
24 changed files with 504 additions and 482 deletions

View File

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