Skip to content

Commit e439792

Browse files
author
Pavol Droba
committed
Merged ADL protection patch from Neil Groves
[SVN r55424]
1 parent 236b142 commit e439792

24 files changed

Lines changed: 406 additions & 385 deletions

‎include/boost/algorithm/string/case_conv.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ namespace boost {
5959
{
6060
return ::boost::algorithm::detail::transform_range_copy(
6161
Output,
62-
as_literal(Input),
62+
::boost::as_literal(Input),
6363
::boost::algorithm::detail::to_lowerF<
6464
typename range_value<RangeT>::type >(Loc));
6565
}
@@ -93,7 +93,7 @@ namespace boost {
9393
const std::locale& Loc=std::locale())
9494
{
9595
::boost::algorithm::detail::transform_range(
96-
as_literal(Input),
96+
::boost::as_literal(Input),
9797
::boost::algorithm::detail::to_lowerF<
9898
typename range_value<WritableRangeT>::type >(Loc));
9999
}
@@ -124,7 +124,7 @@ namespace boost {
124124
{
125125
return ::boost::algorithm::detail::transform_range_copy(
126126
Output,
127-
as_literal(Input),
127+
::boost::as_literal(Input),
128128
::boost::algorithm::detail::to_upperF<
129129
typename range_value<RangeT>::type >(Loc));
130130
}
@@ -158,7 +158,7 @@ namespace boost {
158158
const std::locale& Loc=std::locale())
159159
{
160160
::boost::algorithm::detail::transform_range(
161-
as_literal(Input),
161+
::boost::as_literal(Input),
162162
::boost::algorithm::detail::to_upperF<
163163
typename range_value<WritableRangeT>::type >(Loc));
164164
}

‎include/boost/algorithm/string/classification.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ namespace boost {
202202
BOOST_STRING_TYPENAME range_value<RangeT>::type>
203203
is_any_of( const RangeT& Set )
204204
{
205-
iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_set(as_literal(Set));
205+
iterator_range<BOOST_STRING_TYPENAME range_const_iterator<RangeT>::type> lit_set(boost::as_literal(Set));
206206
return detail::is_any_ofF<BOOST_STRING_TYPENAME range_value<RangeT>::type>(lit_set);
207207
}
208208

‎include/boost/algorithm/string/detail/case_conv.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ namespace boost {
105105
FunctorT Functor)
106106
{
107107
return SequenceT(
108-
make_transform_iterator(
108+
::boost::make_transform_iterator(
109109
::boost::begin(Input),
110110
Functor),
111-
make_transform_iterator(
111+
::boost::make_transform_iterator(
112112
::boost::end(Input),
113113
Functor));
114114
}

‎include/boost/algorithm/string/detail/find_format.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace boost {
3535
FormatterT Formatter,
3636
const FindResultT& FindResult )
3737
{
38-
return find_format_copy_impl2(
38+
return ::boost::algorithm::detail::find_format_copy_impl2(
3939
Output,
4040
Input,
4141
Formatter,
@@ -94,7 +94,7 @@ namespace boost {
9494
FormatterT Formatter,
9595
const FindResultT& FindResult)
9696
{
97-
return find_format_copy_impl2(
97+
return ::boost::algorithm::detail::find_format_copy_impl2(
9898
Input,
9999
Formatter,
100100
FindResult,
@@ -149,7 +149,7 @@ namespace boost {
149149
FormatterT Formatter,
150150
const FindResultT& FindResult)
151151
{
152-
find_format_impl2(
152+
::boost::algorithm::detail::find_format_impl2(
153153
Input,
154154
Formatter,
155155
FindResult,
@@ -183,7 +183,7 @@ namespace boost {
183183
}
184184

185185
// Replace match
186-
replace( Input, M.begin(), M.end(), M.format_result() );
186+
::boost::algorithm::detail::replace( Input, M.begin(), M.end(), M.format_result() );
187187
}
188188

189189
} // namespace detail

‎include/boost/algorithm/string/detail/find_format_all.hpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace boost {
3737
FormatterT Formatter,
3838
const FindResultT& FindResult )
3939
{
40-
return find_format_all_copy_impl2(
40+
return ::boost::algorithm::detail::find_format_all_copy_impl2(
4141
Output,
4242
Input,
4343
Finder,
@@ -107,7 +107,7 @@ namespace boost {
107107
FormatterT Formatter,
108108
const FindResultT& FindResult)
109109
{
110-
return find_format_all_copy_impl2(
110+
return ::boost::algorithm::detail::find_format_all_copy_impl2(
111111
Input,
112112
Finder,
113113
Formatter,
@@ -159,7 +159,7 @@ namespace boost {
159159
}
160160

161161
// Copy the rest of the sequence
162-
insert( Output, ::boost::end(Output), LastMatch, ::boost::end(Input) );
162+
::boost::algorithm::detail::insert( Output, ::boost::end(Output), LastMatch, ::boost::end(Input) );
163163

164164
return Output;
165165
}
@@ -177,7 +177,7 @@ namespace boost {
177177
FormatterT Formatter,
178178
FindResultT FindResult)
179179
{
180-
find_format_all_impl2(
180+
::boost::algorithm::detail::find_format_all_impl2(
181181
Input,
182182
Finder,
183183
Formatter,
@@ -230,14 +230,14 @@ namespace boost {
230230
SearchIt=M.end();
231231

232232
// Copy formated replace to the storage
233-
copy_to_storage( Storage, M.format_result() );
233+
::boost::algorithm::detail::copy_to_storage( Storage, M.format_result() );
234234

235235
// Find range for a next match
236236
M=Finder( SearchIt, ::boost::end(Input) );
237237
}
238238

239239
// process the last segment
240-
InsertIt=process_segment(
240+
InsertIt=::boost::algorithm::detail::process_segment(
241241
Storage,
242242
Input,
243243
InsertIt,
@@ -247,12 +247,12 @@ namespace boost {
247247
if ( Storage.empty() )
248248
{
249249
// Truncate input
250-
erase( Input, InsertIt, ::boost::end(Input) );
250+
::boost::algorithm::detail::erase( Input, InsertIt, ::boost::end(Input) );
251251
}
252252
else
253253
{
254254
// Copy remaining data to the end of input
255-
insert( Input, ::boost::end(Input), Storage.begin(), Storage.end() );
255+
::boost::algorithm::detail::insert( Input, ::boost::end(Input), Storage.begin(), Storage.end() );
256256
}
257257
}
258258

‎include/boost/algorithm/string/detail/finder.hpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ namespace boost {
382382
typedef BOOST_STRING_TYPENAME boost::detail::
383383
iterator_traits<ForwardIteratorT>::iterator_category category;
384384

385-
return find_head_impl( Begin, End, N, category() );
385+
return ::boost::algorithm::detail::find_head_impl( Begin, End, N, category() );
386386
}
387387

388388
template< typename ForwardIteratorT >
@@ -456,7 +456,7 @@ namespace boost {
456456
typedef BOOST_STRING_TYPENAME boost::detail::
457457
iterator_traits<ForwardIteratorT>::iterator_category category;
458458

459-
return find_tail_impl( Begin, End, N, category() );
459+
return ::boost::algorithm::detail::find_tail_impl( Begin, End, N, category() );
460460
}
461461

462462

@@ -484,14 +484,14 @@ namespace boost {
484484
{
485485
if(m_N>=0)
486486
{
487-
return find_head_impl( Begin, End, m_N );
487+
return ::boost::algorithm::detail::find_head_impl( Begin, End, m_N );
488488
}
489489
else
490490
{
491491
iterator_range<ForwardIteratorT> Res=
492-
find_tail_impl( Begin, End, -m_N );
492+
::boost::algorithm::detail::find_tail_impl( Begin, End, -m_N );
493493

494-
return make_iterator_range(Begin, Res.begin());
494+
return ::boost::make_iterator_range(Begin, Res.begin());
495495
}
496496
}
497497

@@ -522,14 +522,14 @@ namespace boost {
522522
{
523523
if(m_N>=0)
524524
{
525-
return find_tail_impl( Begin, End, m_N );
525+
return ::boost::algorithm::detail::find_tail_impl( Begin, End, m_N );
526526
}
527527
else
528528
{
529529
iterator_range<ForwardIteratorT> Res=
530-
find_head_impl( Begin, End, -m_N );
530+
::boost::algorithm::detail::find_head_impl( Begin, End, -m_N );
531531

532-
return make_iterator_range(Res.end(), End);
532+
return ::boost::make_iterator_range(Res.end(), End);
533533
}
534534
}
535535

‎include/boost/algorithm/string/detail/finder_regex.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ namespace boost {
9898
// instantiate match result
9999
match_results<input_iterator_type> result;
100100
// search for a match
101-
if ( regex_search( Begin, End, result, m_Rx, m_MatchFlags ) )
101+
if ( ::boost::regex_search( Begin, End, result, m_Rx, m_MatchFlags ) )
102102
{
103103
// construct a result
104104
return result_type( result );

‎include/boost/algorithm/string/detail/predicate.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ namespace boost {
6363

6464
iterator_range<ForwardIterator1T> Result
6565
=last_finder(
66-
make_iterator_range(SubBegin, SubEnd),
66+
::boost::make_iterator_range(SubBegin, SubEnd),
6767
Comp)(Begin, End);
6868

6969
return !Result.empty() && Result.end()==End;

‎include/boost/algorithm/string/detail/replace_storage.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ namespace boost {
6868
ForwardIteratorT SegmentEnd )
6969
{
7070
// Copy data from the storage until the beginning of the segment
71-
ForwardIteratorT It=move_from_storage( Storage, InsertIt, SegmentBegin );
71+
ForwardIteratorT It=::boost::algorithm::detail::move_from_storage( Storage, InsertIt, SegmentBegin );
7272

7373
// 3 cases are possible :
7474
// a) Storage is empty, It==SegmentBegin
@@ -125,7 +125,7 @@ namespace boost {
125125

126126
{
127127
// Call replace to do the job
128-
replace( Input, InsertIt, SegmentBegin, Storage );
128+
::boost::algorithm::detail::replace( Input, InsertIt, SegmentBegin, Storage );
129129
// Empty the storage
130130
Storage.clear();
131131
// Iterators were not changed, simply return the end of segment

‎include/boost/algorithm/string/detail/sequence.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ namespace boost {
4141
BOOST_STRING_TYPENAME InputT::iterator At,
4242
const InsertT& Insert )
4343
{
44-
insert( Input, At, ::boost::begin(Insert), ::boost::end(Insert) );
44+
::boost::algorithm::detail::insert( Input, At, ::boost::begin(Insert), ::boost::end(Insert) );
4545
}
4646

4747
// erase helper ---------------------------------------------------//
@@ -184,11 +184,11 @@ namespace boost {
184184
{
185185
if(From!=To)
186186
{
187-
replace( Input, From, To, ::boost::begin(Insert), ::boost::end(Insert) );
187+
::boost::algorithm::detail::replace( Input, From, To, ::boost::begin(Insert), ::boost::end(Insert) );
188188
}
189189
else
190190
{
191-
insert( Input, From, ::boost::begin(Insert), ::boost::end(Insert) );
191+
::boost::algorithm::detail::insert( Input, From, ::boost::begin(Insert), ::boost::end(Insert) );
192192
}
193193
}
194194

0 commit comments

Comments
 (0)