summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-04-11 18:19:17 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-04-11 19:20:07 (GMT)
commit857e44c156a1dbefcb49bb5792c4384cebd8762a (patch)
tree11947fb81ad9c502627f1b2bb8f090fb8d53c107 /3rdParty/Boost/src/boost/algorithm
parent77d4eb7588e113beaa03f3347523b26adefdeb06 (diff)
downloadswift-contrib-857e44c156a1dbefcb49bb5792c4384cebd8762a.zip
swift-contrib-857e44c156a1dbefcb49bb5792c4384cebd8762a.tar.bz2
Updated Boost to 1.42.
Diffstat (limited to '3rdParty/Boost/src/boost/algorithm')
-rw-r--r--3rdParty/Boost/src/boost/algorithm/string/case_conv.hpp8
-rw-r--r--3rdParty/Boost/src/boost/algorithm/string/detail/case_conv.hpp4
-rw-r--r--3rdParty/Boost/src/boost/algorithm/string/detail/find_format.hpp73
-rw-r--r--3rdParty/Boost/src/boost/algorithm/string/detail/find_format_all.hpp88
-rw-r--r--3rdParty/Boost/src/boost/algorithm/string/detail/finder.hpp16
-rw-r--r--3rdParty/Boost/src/boost/algorithm/string/detail/replace_storage.hpp4
-rw-r--r--3rdParty/Boost/src/boost/algorithm/string/detail/sequence.hpp6
-rw-r--r--3rdParty/Boost/src/boost/algorithm/string/erase.hpp196
-rw-r--r--3rdParty/Boost/src/boost/algorithm/string/find_format.hpp82
-rw-r--r--3rdParty/Boost/src/boost/algorithm/string/finder.hpp12
-rw-r--r--3rdParty/Boost/src/boost/algorithm/string/formatter.hpp2
-rw-r--r--3rdParty/Boost/src/boost/algorithm/string/replace.hpp198
12 files changed, 354 insertions, 335 deletions
diff --git a/3rdParty/Boost/src/boost/algorithm/string/case_conv.hpp b/3rdParty/Boost/src/boost/algorithm/string/case_conv.hpp
index 536c022..683340b 100644
--- a/3rdParty/Boost/src/boost/algorithm/string/case_conv.hpp
+++ b/3rdParty/Boost/src/boost/algorithm/string/case_conv.hpp
@@ -59,7 +59,7 @@ namespace boost {
{
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 @@ namespace boost {
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 @@ namespace boost {
{
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 @@ namespace boost {
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));
}
diff --git a/3rdParty/Boost/src/boost/algorithm/string/detail/case_conv.hpp b/3rdParty/Boost/src/boost/algorithm/string/detail/case_conv.hpp
index 5253454..3440c27 100644
--- a/3rdParty/Boost/src/boost/algorithm/string/detail/case_conv.hpp
+++ b/3rdParty/Boost/src/boost/algorithm/string/detail/case_conv.hpp
@@ -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));
}
diff --git a/3rdParty/Boost/src/boost/algorithm/string/detail/find_format.hpp b/3rdParty/Boost/src/boost/algorithm/string/detail/find_format.hpp
index 8fb625e..0d8b104 100644
--- a/3rdParty/Boost/src/boost/algorithm/string/detail/find_format.hpp
+++ b/3rdParty/Boost/src/boost/algorithm/string/detail/find_format.hpp
@@ -24,26 +24,7 @@ namespace boost {
// find_format_copy (iterator variant) implementation -------------------------------//
- template<
- typename OutputIteratorT,
- typename InputT,
- typename FormatterT,
- typename FindResultT >
- inline OutputIteratorT find_format_copy_impl(
- OutputIteratorT Output,
- const InputT& Input,
- FormatterT Formatter,
- const FindResultT& FindResult )
- {
- return find_format_copy_impl2(
- Output,
- Input,
- Formatter,
- FindResult,
- Formatter(FindResult) );
- }
-
- template<
+ template<
typename OutputIteratorT,
typename InputT,
typename FormatterT,
@@ -83,25 +64,29 @@ namespace boost {
return Output;
}
-// find_format_copy implementation --------------------------------------------------//
-
template<
- typename InputT,
+ typename OutputIteratorT,
+ typename InputT,
typename FormatterT,
typename FindResultT >
- inline InputT find_format_copy_impl(
+ inline OutputIteratorT find_format_copy_impl(
+ OutputIteratorT Output,
const InputT& Input,
FormatterT Formatter,
- const FindResultT& FindResult)
- {
- return find_format_copy_impl2(
+ const FindResultT& FindResult )
+ {
+ return ::boost::algorithm::detail::find_format_copy_impl2(
+ Output,
Input,
Formatter,
FindResult,
Formatter(FindResult) );
}
- template<
+
+// find_format_copy implementation --------------------------------------------------//
+
+ template<
typename InputT,
typename FormatterT,
typename FindResultT,
@@ -138,24 +123,24 @@ namespace boost {
return Output;
}
-// replace implementation ----------------------------------------------------//
-
- template<
- typename InputT,
+ template<
+ typename InputT,
typename FormatterT,
typename FindResultT >
- inline void find_format_impl(
- InputT& Input,
+ inline InputT find_format_copy_impl(
+ const InputT& Input,
FormatterT Formatter,
const FindResultT& FindResult)
{
- find_format_impl2(
+ return ::boost::algorithm::detail::find_format_copy_impl2(
Input,
Formatter,
FindResult,
Formatter(FindResult) );
}
+ // replace implementation ----------------------------------------------------//
+
template<
typename InputT,
typename FormatterT,
@@ -183,7 +168,23 @@ 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() );
+ }
+
+ template<
+ typename InputT,
+ typename FormatterT,
+ typename FindResultT >
+ inline void find_format_impl(
+ InputT& Input,
+ FormatterT Formatter,
+ const FindResultT& FindResult)
+ {
+ ::boost::algorithm::detail::find_format_impl2(
+ Input,
+ Formatter,
+ FindResult,
+ Formatter(FindResult) );
}
} // namespace detail
diff --git a/3rdParty/Boost/src/boost/algorithm/string/detail/find_format_all.hpp b/3rdParty/Boost/src/boost/algorithm/string/detail/find_format_all.hpp
index 9533be6..36edf56 100644
--- a/3rdParty/Boost/src/boost/algorithm/string/detail/find_format_all.hpp
+++ b/3rdParty/Boost/src/boost/algorithm/string/detail/find_format_all.hpp
@@ -24,29 +24,7 @@ namespace boost {
// find_format_all_copy (iterator variant) implementation ---------------------------//
- template<
- typename OutputIteratorT,
- typename InputT,
- typename FinderT,
- typename FormatterT,
- typename FindResultT >
- inline OutputIteratorT find_format_all_copy_impl(
- OutputIteratorT Output,
- const InputT& Input,
- FinderT Finder,
- FormatterT Formatter,
- const FindResultT& FindResult )
- {
- return find_format_all_copy_impl2(
- Output,
- Input,
- Finder,
- Formatter,
- FindResult,
- Formatter(FindResult) );
- }
-
- template<
+ template<
typename OutputIteratorT,
typename InputT,
typename FinderT,
@@ -94,20 +72,21 @@ namespace boost {
return Output;
}
-// find_format_all_copy implementation ----------------------------------------------//
-
template<
- typename InputT,
+ typename OutputIteratorT,
+ typename InputT,
typename FinderT,
typename FormatterT,
typename FindResultT >
- inline InputT find_format_all_copy_impl(
+ inline OutputIteratorT find_format_all_copy_impl(
+ OutputIteratorT Output,
const InputT& Input,
FinderT Finder,
FormatterT Formatter,
- const FindResultT& FindResult)
- {
- return find_format_all_copy_impl2(
+ const FindResultT& FindResult )
+ {
+ return ::boost::algorithm::detail::find_format_all_copy_impl2(
+ Output,
Input,
Finder,
Formatter,
@@ -115,7 +94,9 @@ namespace boost {
Formatter(FindResult) );
}
- template<
+ // find_format_all_copy implementation ----------------------------------------------//
+
+ template<
typename InputT,
typename FinderT,
typename FormatterT,
@@ -159,25 +140,23 @@ 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;
}
-// find_format_all implementation ------------------------------------------------//
-
- template<
- typename InputT,
+ template<
+ typename InputT,
typename FinderT,
typename FormatterT,
typename FindResultT >
- inline void find_format_all_impl(
- InputT& Input,
+ inline InputT find_format_all_copy_impl(
+ const InputT& Input,
FinderT Finder,
FormatterT Formatter,
- FindResultT FindResult)
+ const FindResultT& FindResult)
{
- find_format_all_impl2(
+ return ::boost::algorithm::detail::find_format_all_copy_impl2(
Input,
Finder,
Formatter,
@@ -185,6 +164,8 @@ namespace boost {
Formatter(FindResult) );
}
+ // find_format_all implementation ------------------------------------------------//
+
template<
typename InputT,
typename FinderT,
@@ -230,14 +211,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,15 +228,34 @@ 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() );
}
}
+ template<
+ typename InputT,
+ typename FinderT,
+ typename FormatterT,
+ typename FindResultT >
+ inline void find_format_all_impl(
+ InputT& Input,
+ FinderT Finder,
+ FormatterT Formatter,
+ FindResultT FindResult)
+ {
+ ::boost::algorithm::detail::find_format_all_impl2(
+ Input,
+ Finder,
+ Formatter,
+ FindResult,
+ Formatter(FindResult) );
+ }
+
} // namespace detail
} // namespace algorithm
} // namespace boost
diff --git a/3rdParty/Boost/src/boost/algorithm/string/detail/finder.hpp b/3rdParty/Boost/src/boost/algorithm/string/detail/finder.hpp
index c6d0752..45bcb7d 100644
--- a/3rdParty/Boost/src/boost/algorithm/string/detail/finder.hpp
+++ b/3rdParty/Boost/src/boost/algorithm/string/detail/finder.hpp
@@ -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);
}
}
diff --git a/3rdParty/Boost/src/boost/algorithm/string/detail/replace_storage.hpp b/3rdParty/Boost/src/boost/algorithm/string/detail/replace_storage.hpp
index 7aff247..db35e4c 100644
--- a/3rdParty/Boost/src/boost/algorithm/string/detail/replace_storage.hpp
+++ b/3rdParty/Boost/src/boost/algorithm/string/detail/replace_storage.hpp
@@ -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
diff --git a/3rdParty/Boost/src/boost/algorithm/string/detail/sequence.hpp b/3rdParty/Boost/src/boost/algorithm/string/detail/sequence.hpp
index de01350..dc47409 100644
--- a/3rdParty/Boost/src/boost/algorithm/string/detail/sequence.hpp
+++ b/3rdParty/Boost/src/boost/algorithm/string/detail/sequence.hpp
@@ -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) );
}
}
diff --git a/3rdParty/Boost/src/boost/algorithm/string/erase.hpp b/3rdParty/Boost/src/boost/algorithm/string/erase.hpp
index b50323b..0951b8a 100644
--- a/3rdParty/Boost/src/boost/algorithm/string/erase.hpp
+++ b/3rdParty/Boost/src/boost/algorithm/string/erase.hpp
@@ -54,11 +54,11 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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
diff --git a/3rdParty/Boost/src/boost/algorithm/string/find_format.hpp b/3rdParty/Boost/src/boost/algorithm/string/find_format.hpp
index 7cbaf34..ef03739 100644
--- a/3rdParty/Boost/src/boost/algorithm/string/find_format.hpp
+++ b/3rdParty/Boost/src/boost/algorithm/string/find_format.hpp
@@ -62,15 +62,18 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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,
diff --git a/3rdParty/Boost/src/boost/algorithm/string/finder.hpp b/3rdParty/Boost/src/boost/algorithm/string/finder.hpp
index c936ddb..4c7ac38 100644
--- a/3rdParty/Boost/src/boost/algorithm/string/finder.hpp
+++ b/3rdParty/Boost/src/boost/algorithm/string/finder.hpp
@@ -56,7 +56,7 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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
diff --git a/3rdParty/Boost/src/boost/algorithm/string/formatter.hpp b/3rdParty/Boost/src/boost/algorithm/string/formatter.hpp
index e04a50f..50006df 100644
--- a/3rdParty/Boost/src/boost/algorithm/string/formatter.hpp
+++ b/3rdParty/Boost/src/boost/algorithm/string/formatter.hpp
@@ -50,7 +50,7 @@ namespace boost {
{
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
diff --git a/3rdParty/Boost/src/boost/algorithm/string/replace.hpp b/3rdParty/Boost/src/boost/algorithm/string/replace.hpp
index 1c59ec7..f2d201f 100644
--- a/3rdParty/Boost/src/boost/algorithm/string/replace.hpp
+++ b/3rdParty/Boost/src/boost/algorithm/string/replace.hpp
@@ -61,11 +61,11 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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