Skip to content

Commit f33d749

Browse files
QuuxplusoneQuuxplusone
committed
[libc++] [test] Qualify distance as std::distance in a lot of tests. NFCI.
We shouldn't be calling `distance` via ADL -- and neither should anybody in the wild be calling it via ADL, so it's not like we need to test this ADL ability of `distance` in particular. Differential Revision: https://reviews.llvm.org/D119685
1 parent 87b218b commit f33d749

File tree

106 files changed

+566
-566
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+566
-566
lines changed

‎libcxx/test/std/containers/associative/map/map.cons/assign_initializer_list.pass.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void test_basic() {
4141
{3, 2}
4242
};
4343
assert(m.size() == 3);
44-
assert(distance(m.begin(), m.end()) == 3);
44+
assert(std::distance(m.begin(), m.end()) == 3);
4545
assert(*m.begin() == V(1, 1));
4646
assert(*next(m.begin()) == V(2, 1));
4747
assert(*next(m.begin(), 2) == V(3, 1));
@@ -65,7 +65,7 @@ void test_basic() {
6565
{3, 2}
6666
};
6767
assert(m.size() == 3);
68-
assert(distance(m.begin(), m.end()) == 3);
68+
assert(std::distance(m.begin(), m.end()) == 3);
6969
assert(*m.begin() == V(1, 1));
7070
assert(*next(m.begin()) == V(2, 1));
7171
assert(*next(m.begin(), 2) == V(3, 1));

‎libcxx/test/std/containers/associative/map/map.cons/copy.pass.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ int main(int, char**)
4343
assert(m.get_allocator() == A(7));
4444
assert(m.key_comp() == C(5));
4545
assert(m.size() == 3);
46-
assert(distance(m.begin(), m.end()) == 3);
46+
assert(std::distance(m.begin(), m.end()) == 3);
4747
assert(*m.begin() == V(1, 1));
4848
assert(*next(m.begin()) == V(2, 1));
4949
assert(*next(m.begin(), 2) == V(3, 1));
5050

5151
assert(mo.get_allocator() == A(7));
5252
assert(mo.key_comp() == C(5));
5353
assert(mo.size() == 3);
54-
assert(distance(mo.begin(), mo.end()) == 3);
54+
assert(std::distance(mo.begin(), mo.end()) == 3);
5555
assert(*mo.begin() == V(1, 1));
5656
assert(*next(mo.begin()) == V(2, 1));
5757
assert(*next(mo.begin(), 2) == V(3, 1));
@@ -78,15 +78,15 @@ int main(int, char**)
7878
assert(m.get_allocator() == A(-2));
7979
assert(m.key_comp() == C(5));
8080
assert(m.size() == 3);
81-
assert(distance(m.begin(), m.end()) == 3);
81+
assert(std::distance(m.begin(), m.end()) == 3);
8282
assert(*m.begin() == V(1, 1));
8383
assert(*next(m.begin()) == V(2, 1));
8484
assert(*next(m.begin(), 2) == V(3, 1));
8585

8686
assert(mo.get_allocator() == A(7));
8787
assert(mo.key_comp() == C(5));
8888
assert(mo.size() == 3);
89-
assert(distance(mo.begin(), mo.end()) == 3);
89+
assert(std::distance(mo.begin(), mo.end()) == 3);
9090
assert(*mo.begin() == V(1, 1));
9191
assert(*next(mo.begin()) == V(2, 1));
9292
assert(*next(mo.begin(), 2) == V(3, 1));
@@ -112,15 +112,15 @@ int main(int, char**)
112112
assert(m.get_allocator() == A());
113113
assert(m.key_comp() == C(5));
114114
assert(m.size() == 3);
115-
assert(distance(m.begin(), m.end()) == 3);
115+
assert(std::distance(m.begin(), m.end()) == 3);
116116
assert(*m.begin() == V(1, 1));
117117
assert(*next(m.begin()) == V(2, 1));
118118
assert(*next(m.begin(), 2) == V(3, 1));
119119

120120
assert(mo.get_allocator() == A());
121121
assert(mo.key_comp() == C(5));
122122
assert(mo.size() == 3);
123-
assert(distance(mo.begin(), mo.end()) == 3);
123+
assert(std::distance(mo.begin(), mo.end()) == 3);
124124
assert(*mo.begin() == V(1, 1));
125125
assert(*next(mo.begin()) == V(2, 1));
126126
assert(*next(mo.begin(), 2) == V(3, 1));

‎libcxx/test/std/containers/associative/map/map.cons/copy_alloc.pass.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ int main(int, char**)
4343
assert(m.get_allocator() == A(3));
4444
assert(m.key_comp() == C(5));
4545
assert(m.size() == 3);
46-
assert(distance(m.begin(), m.end()) == 3);
46+
assert(std::distance(m.begin(), m.end()) == 3);
4747
assert(*m.begin() == V(1, 1));
4848
assert(*next(m.begin()) == V(2, 1));
4949
assert(*next(m.begin(), 2) == V(3, 1));
5050

5151
assert(mo.get_allocator() == A(7));
5252
assert(mo.key_comp() == C(5));
5353
assert(mo.size() == 3);
54-
assert(distance(mo.begin(), mo.end()) == 3);
54+
assert(std::distance(mo.begin(), mo.end()) == 3);
5555
assert(*mo.begin() == V(1, 1));
5656
assert(*next(mo.begin()) == V(2, 1));
5757
assert(*next(mo.begin(), 2) == V(3, 1));
@@ -78,15 +78,15 @@ int main(int, char**)
7878
assert(m.get_allocator() == A());
7979
assert(m.key_comp() == C(5));
8080
assert(m.size() == 3);
81-
assert(distance(m.begin(), m.end()) == 3);
81+
assert(std::distance(m.begin(), m.end()) == 3);
8282
assert(*m.begin() == V(1, 1));
8383
assert(*next(m.begin()) == V(2, 1));
8484
assert(*next(m.begin(), 2) == V(3, 1));
8585

8686
assert(mo.get_allocator() == A());
8787
assert(mo.key_comp() == C(5));
8888
assert(mo.size() == 3);
89-
assert(distance(mo.begin(), mo.end()) == 3);
89+
assert(std::distance(mo.begin(), mo.end()) == 3);
9090
assert(*mo.begin() == V(1, 1));
9191
assert(*next(mo.begin()) == V(2, 1));
9292
assert(*next(mo.begin(), 2) == V(3, 1));
@@ -112,15 +112,15 @@ int main(int, char**)
112112
assert(m.get_allocator() == A());
113113
assert(m.key_comp() == C(5));
114114
assert(m.size() == 3);
115-
assert(distance(m.begin(), m.end()) == 3);
115+
assert(std::distance(m.begin(), m.end()) == 3);
116116
assert(*m.begin() == V(1, 1));
117117
assert(*next(m.begin()) == V(2, 1));
118118
assert(*next(m.begin(), 2) == V(3, 1));
119119

120120
assert(mo.get_allocator() == A());
121121
assert(mo.key_comp() == C(5));
122122
assert(mo.size() == 3);
123-
assert(distance(mo.begin(), mo.end()) == 3);
123+
assert(std::distance(mo.begin(), mo.end()) == 3);
124124
assert(*mo.begin() == V(1, 1));
125125
assert(*next(mo.begin()) == V(2, 1));
126126
assert(*next(mo.begin(), 2) == V(3, 1));

‎libcxx/test/std/containers/associative/map/map.cons/copy_assign.pass.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,15 @@ int main(int, char**)
138138
assert(m.get_allocator() == A(7));
139139
assert(m.key_comp() == C(5));
140140
assert(m.size() == 3);
141-
assert(distance(m.begin(), m.end()) == 3);
141+
assert(std::distance(m.begin(), m.end()) == 3);
142142
assert(*m.begin() == V(1, 1));
143143
assert(*next(m.begin()) == V(2, 1));
144144
assert(*next(m.begin(), 2) == V(3, 1));
145145

146146
assert(mo.get_allocator() == A(2));
147147
assert(mo.key_comp() == C(5));
148148
assert(mo.size() == 3);
149-
assert(distance(mo.begin(), mo.end()) == 3);
149+
assert(std::distance(mo.begin(), mo.end()) == 3);
150150
assert(*mo.begin() == V(1, 1));
151151
assert(*next(mo.begin()) == V(2, 1));
152152
assert(*next(mo.begin(), 2) == V(3, 1));
@@ -188,15 +188,15 @@ int main(int, char**)
188188
assert(m.get_allocator() == A(2));
189189
assert(m.key_comp() == C(5));
190190
assert(m.size() == 3);
191-
assert(distance(m.begin(), m.end()) == 3);
191+
assert(std::distance(m.begin(), m.end()) == 3);
192192
assert(*m.begin() == V(1, 1));
193193
assert(*next(m.begin()) == V(2, 1));
194194
assert(*next(m.begin(), 2) == V(3, 1));
195195

196196
assert(mo.get_allocator() == A(2));
197197
assert(mo.key_comp() == C(5));
198198
assert(mo.size() == 3);
199-
assert(distance(mo.begin(), mo.end()) == 3);
199+
assert(std::distance(mo.begin(), mo.end()) == 3);
200200
assert(*mo.begin() == V(1, 1));
201201
assert(*next(mo.begin()) == V(2, 1));
202202
assert(*next(mo.begin(), 2) == V(3, 1));
@@ -224,15 +224,15 @@ int main(int, char**)
224224
assert(m.get_allocator() == A());
225225
assert(m.key_comp() == C(5));
226226
assert(m.size() == 3);
227-
assert(distance(m.begin(), m.end()) == 3);
227+
assert(std::distance(m.begin(), m.end()) == 3);
228228
assert(*m.begin() == V(1, 1));
229229
assert(*next(m.begin()) == V(2, 1));
230230
assert(*next(m.begin(), 2) == V(3, 1));
231231

232232
assert(mo.get_allocator() == A());
233233
assert(mo.key_comp() == C(5));
234234
assert(mo.size() == 3);
235-
assert(distance(mo.begin(), mo.end()) == 3);
235+
assert(std::distance(mo.begin(), mo.end()) == 3);
236236
assert(*mo.begin() == V(1, 1));
237237
assert(*next(mo.begin()) == V(2, 1));
238238
assert(*next(mo.begin(), 2) == V(3, 1));
@@ -259,15 +259,15 @@ int main(int, char**)
259259
assert(m.get_allocator() == A());
260260
assert(m.key_comp() == C(5));
261261
assert(m.size() == 3);
262-
assert(distance(m.begin(), m.end()) == 3);
262+
assert(std::distance(m.begin(), m.end()) == 3);
263263
assert(*m.begin() == V(1, 1));
264264
assert(*next(m.begin()) == V(2, 1));
265265
assert(*next(m.begin(), 2) == V(3, 1));
266266

267267
assert(mo.get_allocator() == A());
268268
assert(mo.key_comp() == C(5));
269269
assert(mo.size() == 3);
270-
assert(distance(mo.begin(), mo.end()) == 3);
270+
assert(std::distance(mo.begin(), mo.end()) == 3);
271271
assert(*mo.begin() == V(1, 1));
272272
assert(*next(mo.begin()) == V(2, 1));
273273
assert(*next(mo.begin(), 2) == V(3, 1));
@@ -295,14 +295,14 @@ int main(int, char**)
295295
m = mo;
296296
assert(m.key_comp() == C(5));
297297
assert(m.size() == 3);
298-
assert(distance(m.begin(), m.end()) == 3);
298+
assert(std::distance(m.begin(), m.end()) == 3);
299299
assert(*m.begin() == V(1, 1));
300300
assert(*next(m.begin()) == V(2, 1));
301301
assert(*next(m.begin(), 2) == V(3, 1));
302302

303303
assert(mo.key_comp() == C(5));
304304
assert(mo.size() == 3);
305-
assert(distance(mo.begin(), mo.end()) == 3);
305+
assert(std::distance(mo.begin(), mo.end()) == 3);
306306
assert(*mo.begin() == V(1, 1));
307307
assert(*next(mo.begin()) == V(2, 1));
308308
assert(*next(mo.begin(), 2) == V(3, 1));
@@ -329,14 +329,14 @@ int main(int, char**)
329329
m = mo;
330330
assert(m.key_comp() == C(5));
331331
assert(m.size() == 3);
332-
assert(distance(m.begin(), m.end()) == 3);
332+
assert(std::distance(m.begin(), m.end()) == 3);
333333
assert(*m.begin() == V(1, 1));
334334
assert(*next(m.begin()) == V(2, 1));
335335
assert(*next(m.begin(), 2) == V(3, 1));
336336

337337
assert(mo.key_comp() == C(5));
338338
assert(mo.size() == 3);
339-
assert(distance(mo.begin(), mo.end()) == 3);
339+
assert(std::distance(mo.begin(), mo.end()) == 3);
340340
assert(*mo.begin() == V(1, 1));
341341
assert(*next(mo.begin()) == V(2, 1));
342342
assert(*next(mo.begin(), 2) == V(3, 1));

‎libcxx/test/std/containers/associative/map/map.cons/initializer_list.pass.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ int main(int, char**)
3737
{3, 2}
3838
};
3939
assert(m.size() == 3);
40-
assert(distance(m.begin(), m.end()) == 3);
40+
assert(std::distance(m.begin(), m.end()) == 3);
4141
assert(*m.begin() == V(1, 1));
4242
assert(*next(m.begin()) == V(2, 1));
4343
assert(*next(m.begin(), 2) == V(3, 1));
@@ -57,7 +57,7 @@ int main(int, char**)
5757
{3, 2}
5858
};
5959
assert(m.size() == 3);
60-
assert(distance(m.begin(), m.end()) == 3);
60+
assert(std::distance(m.begin(), m.end()) == 3);
6161
assert(*m.begin() == V(1, 1));
6262
assert(*next(m.begin()) == V(2, 1));
6363
assert(*next(m.begin(), 2) == V(3, 1));

‎libcxx/test/std/containers/associative/map/map.cons/initializer_list_compare.pass.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ int main(int, char**)
3737
{3, 2}
3838
}, C(3));
3939
assert(m.size() == 3);
40-
assert(distance(m.begin(), m.end()) == 3);
40+
assert(std::distance(m.begin(), m.end()) == 3);
4141
assert(*m.begin() == V(1, 1));
4242
assert(*next(m.begin()) == V(2, 1));
4343
assert(*next(m.begin(), 2) == V(3, 1));
@@ -58,7 +58,7 @@ int main(int, char**)
5858
{3, 2}
5959
}, C(3));
6060
assert(m.size() == 3);
61-
assert(distance(m.begin(), m.end()) == 3);
61+
assert(std::distance(m.begin(), m.end()) == 3);
6262
assert(*m.begin() == V(1, 1));
6363
assert(*next(m.begin()) == V(2, 1));
6464
assert(*next(m.begin(), 2) == V(3, 1));

‎libcxx/test/std/containers/associative/map/map.cons/initializer_list_compare_alloc.pass.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ int main(int, char**)
3939
{3, 2}
4040
}, C(3), A(6));
4141
assert(m.size() == 3);
42-
assert(distance(m.begin(), m.end()) == 3);
42+
assert(std::distance(m.begin(), m.end()) == 3);
4343
assert(*m.begin() == V(1, 1));
4444
assert(*next(m.begin()) == V(2, 1));
4545
assert(*next(m.begin(), 2) == V(3, 1));
@@ -62,7 +62,7 @@ int main(int, char**)
6262
{3, 2}
6363
}, C(3), A());
6464
assert(m.size() == 3);
65-
assert(distance(m.begin(), m.end()) == 3);
65+
assert(std::distance(m.begin(), m.end()) == 3);
6666
assert(*m.begin() == V(1, 1));
6767
assert(*next(m.begin()) == V(2, 1));
6868
assert(*next(m.begin(), 2) == V(3, 1));
@@ -87,7 +87,7 @@ int main(int, char**)
8787
}, a);
8888

8989
assert(m.size() == 3);
90-
assert(distance(m.begin(), m.end()) == 3);
90+
assert(std::distance(m.begin(), m.end()) == 3);
9191
assert(*m.begin() == V(1, 1));
9292
assert(*next(m.begin()) == V(2, 1));
9393
assert(*next(m.begin(), 2) == V(3, 1));
@@ -110,7 +110,7 @@ int main(int, char**)
110110
{3, 2}
111111
}, C(3), a);
112112
assert(m.size() == 3);
113-
assert(distance(m.begin(), m.end()) == 3);
113+
assert(std::distance(m.begin(), m.end()) == 3);
114114
assert(*m.begin() == V(1, 1));
115115
assert(*next(m.begin()) == V(2, 1));
116116
assert(*next(m.begin(), 2) == V(3, 1));

‎libcxx/test/std/containers/associative/map/map.cons/iter_iter.pass.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ int main(int, char**)
3737
};
3838
std::map<int, double> m(ar, ar+sizeof(ar)/sizeof(ar[0]));
3939
assert(m.size() == 3);
40-
assert(distance(m.begin(), m.end()) == 3);
40+
assert(std::distance(m.begin(), m.end()) == 3);
4141
assert(*m.begin() == V(1, 1));
4242
assert(*next(m.begin()) == V(2, 1));
4343
assert(*next(m.begin(), 2) == V(3, 1));
@@ -59,7 +59,7 @@ int main(int, char**)
5959
};
6060
std::map<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> m(ar, ar+sizeof(ar)/sizeof(ar[0]));
6161
assert(m.size() == 3);
62-
assert(distance(m.begin(), m.end()) == 3);
62+
assert(std::distance(m.begin(), m.end()) == 3);
6363
assert(*m.begin() == V(1, 1));
6464
assert(*next(m.begin()) == V(2, 1));
6565
assert(*next(m.begin(), 2) == V(3, 1));

‎libcxx/test/std/containers/associative/map/map.cons/iter_iter_comp.pass.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ int main(int, char**)
4040
std::map<int, double, C> m(ar, ar+sizeof(ar)/sizeof(ar[0]), C(5));
4141
assert(m.key_comp() == C(5));
4242
assert(m.size() == 3);
43-
assert(distance(m.begin(), m.end()) == 3);
43+
assert(std::distance(m.begin(), m.end()) == 3);
4444
assert(*m.begin() == V(1, 1));
4545
assert(*next(m.begin()) == V(2, 1));
4646
assert(*next(m.begin(), 2) == V(3, 1));
@@ -64,7 +64,7 @@ int main(int, char**)
6464
std::map<int, double, C, min_allocator<std::pair<const int, double>>> m(ar, ar+sizeof(ar)/sizeof(ar[0]), C(5));
6565
assert(m.key_comp() == C(5));
6666
assert(m.size() == 3);
67-
assert(distance(m.begin(), m.end()) == 3);
67+
assert(std::distance(m.begin(), m.end()) == 3);
6868
assert(*m.begin() == V(1, 1));
6969
assert(*next(m.begin()) == V(2, 1));
7070
assert(*next(m.begin(), 2) == V(3, 1));

‎libcxx/test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ int main(int, char**)
4444
assert(m.get_allocator() == A(7));
4545
assert(m.key_comp() == C(5));
4646
assert(m.size() == 3);
47-
assert(distance(m.begin(), m.end()) == 3);
47+
assert(std::distance(m.begin(), m.end()) == 3);
4848
assert(*m.begin() == V(1, 1));
4949
assert(*next(m.begin()) == V(2, 1));
5050
assert(*next(m.begin(), 2) == V(3, 1));
@@ -70,7 +70,7 @@ int main(int, char**)
7070
assert(m.get_allocator() == A());
7171
assert(m.key_comp() == C(5));
7272
assert(m.size() == 3);
73-
assert(distance(m.begin(), m.end()) == 3);
73+
assert(std::distance(m.begin(), m.end()) == 3);
7474
assert(*m.begin() == V(1, 1));
7575
assert(*next(m.begin()) == V(2, 1));
7676
assert(*next(m.begin(), 2) == V(3, 1));
@@ -97,7 +97,7 @@ int main(int, char**)
9797
std::map<int, double, C, A> m(ar, ar+sizeof(ar)/sizeof(ar[0]), a );
9898

9999
assert(m.size() == 3);
100-
assert(distance(m.begin(), m.end()) == 3);
100+
assert(std::distance(m.begin(), m.end()) == 3);
101101
assert(*m.begin() == V(1, 1));
102102
assert(*next(m.begin()) == V(2, 1));
103103
assert(*next(m.begin(), 2) == V(3, 1));
@@ -110,7 +110,7 @@ int main(int, char**)
110110
std::map<int, double, C, A> m(ar, ar+sizeof(ar)/sizeof(ar[0]), a );
111111

112112
assert(m.size() == 3);
113-
assert(distance(m.begin(), m.end()) == 3);
113+
assert(std::distance(m.begin(), m.end()) == 3);
114114
assert(*m.begin() == V(1, 1));
115115
assert(*next(m.begin()) == V(2, 1));
116116
assert(*next(m.begin(), 2) == V(3, 1));

0 commit comments

Comments
 (0)