Skip to content

Commit 9fa2f90

Browse files
author
Pavol Droba
committed
begin() and end() calls made fully qualified
[SVN r46459]
1 parent 35f317a commit 9fa2f90

17 files changed

Lines changed: 129 additions & 129 deletions

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ namespace boost {
6565
void constraints()
6666
{
6767
// Operation
68-
begin((*pFo)( (*pF)(i,i) ));
69-
end((*pFo)( (*pF)(i,i) ));
68+
::boost::begin((*pFo)( (*pF)(i,i) ));
69+
::boost::end((*pFo)( (*pF)(i,i) ));
7070
}
7171
private:
7272
IteratorT i;

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ namespace boost {
7171
FunctorT Functor)
7272
{
7373
return std::transform(
74-
begin(Input),
75-
end(Input),
74+
::boost::begin(Input),
75+
::boost::end(Input),
7676
Output,
7777
Functor);
7878
}
@@ -84,9 +84,9 @@ namespace boost {
8484
FunctorT Functor)
8585
{
8686
std::transform(
87-
begin(Input),
88-
end(Input),
89-
begin(Input),
87+
::boost::begin(Input),
88+
::boost::end(Input),
89+
::boost::begin(Input),
9090
Functor);
9191
}
9292

@@ -97,10 +97,10 @@ namespace boost {
9797
{
9898
return SequenceT(
9999
make_transform_iterator(
100-
begin(Input),
100+
::boost::begin(Input),
101101
Functor),
102102
make_transform_iterator(
103-
end(Input),
103+
::boost::end(Input),
104104
Functor));
105105
}
106106

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ namespace boost {
7474
// Constructor
7575
template<typename RangeT>
7676
is_any_ofF( const RangeT& Range ) :
77-
m_Set( begin(Range), end(Range) ) {}
77+
m_Set( ::boost::begin(Range), ::boost::end(Range) ) {}
7878

7979
// Operation
8080
template<typename Char2T>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,17 @@ namespace boost {
6868
if ( !M )
6969
{
7070
// Match not found - return original sequence
71-
std::copy( begin(Input), end(Input), Output );
71+
std::copy( ::boost::begin(Input), ::boost::end(Input), Output );
7272
return Output;
7373
}
7474

7575
// Copy the beginning of the sequence
76-
std::copy( begin(Input), begin(M), Output );
76+
std::copy( ::boost::begin(Input), ::boost::begin(M), Output );
7777
// Format find result
7878
// Copy formated result
79-
std::copy( begin(M.format_result()), end(M.format_result()), Output );
79+
std::copy( ::boost::begin(M.format_result()), ::boost::end(M.format_result()), Output );
8080
// Copy the rest of the sequence
81-
std::copy( M.end(), end(Input), Output );
81+
std::copy( M.end(), ::boost::end(Input), Output );
8282

8383
return Output;
8484
}
@@ -129,11 +129,11 @@ namespace boost {
129129

130130
InputT Output;
131131
// Copy the beginning of the sequence
132-
insert( Output, end(Output), begin(Input), M.begin() );
132+
insert( Output, ::boost::end(Output), ::boost::begin(Input), M.begin() );
133133
// Copy formated result
134-
insert( Output, end(Output), M.format_result() );
134+
insert( Output, ::boost::end(Output), M.format_result() );
135135
// Copy the rest of the sequence
136-
insert( Output, end(Output), M.end(), end(Input) );
136+
insert( Output, ::boost::end(Output), M.end(), ::boost::end(Input) );
137137

138138
return Output;
139139
}

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -73,23 +73,23 @@ namespace boost {
7373
store_type M( FindResult, FormatResult, Formatter );
7474

7575
// Initialize last match
76-
input_iterator_type LastMatch=begin(Input);
76+
input_iterator_type LastMatch=::boost::begin(Input);
7777

7878
// Iterate through all matches
7979
while( M )
8080
{
8181
// Copy the beginning of the sequence
8282
std::copy( LastMatch, M.begin(), Output );
8383
// Copy formated result
84-
std::copy( begin(M.format_result()), end(M.format_result()), Output );
84+
std::copy( ::boost::begin(M.format_result()), ::boost::end(M.format_result()), Output );
8585

8686
// Proceed to the next match
8787
LastMatch=M.end();
88-
M=Finder( LastMatch, end(Input) );
88+
M=Finder( LastMatch, ::boost::end(Input) );
8989
}
9090

9191
// Copy the rest of the sequence
92-
std::copy( LastMatch, end(Input), Output );
92+
std::copy( LastMatch, ::boost::end(Input), Output );
9393

9494
return Output;
9595
}
@@ -140,7 +140,7 @@ namespace boost {
140140
store_type M( FindResult, FormatResult, Formatter );
141141

142142
// Initialize last match
143-
input_iterator_type LastMatch=begin(Input);
143+
input_iterator_type LastMatch=::boost::begin(Input);
144144

145145
// Output temporary
146146
InputT Output;
@@ -149,17 +149,17 @@ namespace boost {
149149
while( M )
150150
{
151151
// Copy the beginning of the sequence
152-
insert( Output, end(Output), LastMatch, M.begin() );
152+
insert( Output, ::boost::end(Output), LastMatch, M.begin() );
153153
// Copy formated result
154-
insert( Output, end(Output), M.format_result() );
154+
insert( Output, ::boost::end(Output), M.format_result() );
155155

156156
// Proceed to the next match
157157
LastMatch=M.end();
158-
M=Finder( LastMatch, end(Input) );
158+
M=Finder( LastMatch, ::boost::end(Input) );
159159
}
160160

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

164164
return Output;
165165
}
@@ -213,8 +213,8 @@ namespace boost {
213213
BOOST_STRING_TYPENAME range_value<InputT>::type> Storage;
214214

215215
// Initialize replacement iterators
216-
input_iterator_type InsertIt=begin(Input);
217-
input_iterator_type SearchIt=begin(Input);
216+
input_iterator_type InsertIt=::boost::begin(Input);
217+
input_iterator_type SearchIt=::boost::begin(Input);
218218

219219
while( M )
220220
{
@@ -233,7 +233,7 @@ namespace boost {
233233
copy_to_storage( Storage, M.format_result() );
234234

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

239239
// process the last segment
@@ -242,17 +242,17 @@ namespace boost {
242242
Input,
243243
InsertIt,
244244
SearchIt,
245-
end(Input) );
245+
::boost::end(Input) );
246246

247247
if ( Storage.empty() )
248248
{
249249
// Truncate input
250-
erase( Input, InsertIt, end(Input) );
250+
erase( Input, InsertIt, ::boost::end(Input) );
251251
}
252252
else
253253
{
254254
// Copy remaining data to the end of input
255-
insert( Input, end(Input), Storage.begin(), Storage.end() );
255+
insert( Input, ::boost::end(Input), Storage.begin(), Storage.end() );
256256
}
257257
}
258258

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ namespace boost {
4141
// Construction
4242
template< typename SearchT >
4343
first_finderF( const SearchT& Search, PredicateT Comp ) :
44-
m_Search(begin(Search), end(Search)), m_Comp(Comp) {}
44+
m_Search(::boost::begin(Search), ::boost::end(Search)), m_Comp(Comp) {}
4545
first_finderF(
4646
search_iterator_type SearchBegin,
4747
search_iterator_type SearchEnd,
@@ -108,7 +108,7 @@ namespace boost {
108108
// Construction
109109
template< typename SearchT >
110110
last_finderF( const SearchT& Search, PredicateT Comp ) :
111-
m_Search(begin(Search), end(Search)), m_Comp(Comp) {}
111+
m_Search(::boost::begin(Search), ::boost::end(Search)), m_Comp(Comp) {}
112112
last_finderF(
113113
search_iterator_type SearchBegin,
114114
search_iterator_type SearchEnd,
@@ -154,7 +154,7 @@ namespace boost {
154154
while( M )
155155
{
156156
Last=M;
157-
M=first_finder( end(M), End );
157+
M=first_finder( ::boost::end(M), End );
158158
}
159159

160160
return Last;
@@ -224,7 +224,7 @@ namespace boost {
224224
const SearchT& Search,
225225
int Nth,
226226
PredicateT Comp) :
227-
m_Search(begin(Search), end(Search)),
227+
m_Search(::boost::begin(Search), ::boost::end(Search)),
228228
m_Nth(Nth),
229229
m_Comp(Comp) {}
230230
nth_finderF(
@@ -279,7 +279,7 @@ namespace boost {
279279
for( unsigned int n=0; n<=N; ++n )
280280
{
281281
// find next match
282-
M=first_finder( end(M), End );
282+
M=first_finder( ::boost::end(M), End );
283283

284284
if ( !M )
285285
{
@@ -314,7 +314,7 @@ namespace boost {
314314
for( unsigned int n=1; n<=N; ++n )
315315
{
316316
// find next match
317-
M=last_finder( Begin, begin(M) );
317+
M=last_finder( Begin, ::boost::begin(M) );
318318

319319
if ( !M )
320320
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ namespace boost {
3939
public:
4040
// Construction
4141
const_formatF(const RangeT& Format) :
42-
m_Format(begin(Format), end(Format)) {}
42+
m_Format(::boost::begin(Format), ::boost::end(Format)) {}
4343

4444
// Operation
4545
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
@@ -70,7 +70,7 @@ namespace boost {
7070
template< typename Range2T >
7171
const RangeT& operator()(const Range2T& Replace) const
7272
{
73-
return RangeT(begin(Replace), end(Replace));
73+
return RangeT(::boost::begin(Replace), ::boost::end(Replace));
7474
}
7575
};
7676

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ namespace boost {
4646
StorageT& Storage,
4747
const WhatT& What )
4848
{
49-
Storage.insert( Storage.end(), begin(What), end(What) );
49+
Storage.insert( Storage.end(), ::boost::begin(What), ::boost::end(What) );
5050
}
5151

5252

‎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, begin(Insert), end(Insert) );
44+
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, begin(Insert), end(Insert) );
187+
replace( Input, From, To, ::boost::begin(Insert), ::boost::end(Insert) );
188188
}
189189
else
190190
{
191-
insert( Input, From, begin(Insert), end(Insert) );
191+
insert( Input, From, ::boost::begin(Insert), ::boost::end(Insert) );
192192
}
193193
}
194194

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ namespace boost {
5555
{
5656
iterator_range<BOOST_STRING_TYPENAME range_iterator<RangeT>::type> lit_input(as_literal(Input));
5757

58-
return Finder(begin(lit_input),end(lit_input));
58+
return Finder(::boost::begin(lit_input),::boost::end(lit_input));
5959
}
6060

6161
// find_first -----------------------------------------------//

0 commit comments

Comments
 (0)