maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[libc++] [test] Qualify `prev` as `std::prev` in a lot of tests. NFCI. 

We shouldn't be calling `prev` 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 `prev` in particular.

Reviewed as part of D119860.
This commit is contained in:
Arthur O'Dwyer 2022-02-13 20:09:41 -05:00
parent 5ffe11a9fc
commit 3b966c1fe9
17 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libcxx/test/std/containers/associative/map/map.modifiers/insert_cv.pass.cpp
View File

@ -45,7 +45,7 @@ void do_insert_cv_test()
const VT v3(3, 3.5);
r = m.insert(v3);
assert(r.second);
assert(r.first == prev(m.end()));
assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(r.first->first == 3);
assert(r.first->second == 3.5);
@ -53,7 +53,7 @@ void do_insert_cv_test()
const VT v4(3, 4.5);
r = m.insert(v4);
assert(!r.second);
assert(r.first == prev(m.end()));
assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(r.first->first == 3);
assert(r.first->second == 3.5);

4
libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_cv.pass.cpp
View File

@ -42,14 +42,14 @@ void do_insert_iter_cv_test()
const VT v3(3, 3.5);
r = m.insert(m.end(), v3);
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3.5);
const VT v4(3, 4.5);
r = m.insert(m.end(), v4);
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3.5);

8
libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp
View File

@ -42,13 +42,13 @@ void do_insert_iter_rv_test()
assert(r->second == 1);
r = m.insert(m.end(), P(3, 3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3);
r = m.insert(m.end(), P(3, 4));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3);
@ -82,13 +82,13 @@ int main(int, char**)
assert(r->second == 1);
r = m.insert(m.end(), {3, MoveOnly(3)});
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3);
r = m.insert(m.end(), {3, MoveOnly(3)});
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3);

8
libcxx/test/std/containers/associative/map/map.modifiers/insert_rv.pass.cpp
View File

@ -46,14 +46,14 @@ void do_insert_rv_test()
r = m.insert(P(3, 3));
assert(r.second);
assert(r.first == prev(m.end()));
assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(r.first->first == 3);
assert(r.first->second == 3);
r = m.insert(P(3, 3));
assert(!r.second);
assert(r.first == prev(m.end()));
assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(r.first->first == 3);
assert(r.first->second == 3);
@ -91,14 +91,14 @@ int main(int, char**)
r = m.insert({3, MoveOnly(3)});
assert(r.second);
assert(r.first == prev(m.end()));
assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(r.first->first == 3);
assert(r.first->second == 3);
r = m.insert({3, MoveOnly(3)});
assert(!r.second);
assert(r.first == prev(m.end()));
assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(r.first->first == 3);
assert(r.first->second == 3);

4
libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp
View File

@ -86,7 +86,7 @@ int main(int, char**)
i = m.erase(std::next(m.cbegin(), 5));
assert(m.size() == 6);
assert(i == prev(m.end()));
assert(i == std::prev(m.end()));
assert(std::next(m.begin(), 0)->first == 1);
assert(std::next(m.begin(), 0)->second == 1.5);
assert(std::next(m.begin(), 1)->first == 1);
@ -214,7 +214,7 @@ int main(int, char**)
i = m.erase(std::next(m.cbegin(), 5));
assert(m.size() == 6);
assert(i == prev(m.end()));
assert(i == std::prev(m.end()));
assert(std::next(m.begin(), 0)->first == 1);
assert(std::next(m.begin(), 0)->second == 1.5);
assert(std::next(m.begin(), 1)->first == 1);

4
libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_cv.pass.cpp
View File

@ -40,14 +40,14 @@ void do_insert_test() {
const VT v3(3, 3.5);
r = m.insert(v3);
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3.5);
const VT v4(3, 3.5);
r = m.insert(v4);
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(r->first == 3);
assert(r->second == 3.5);

6
libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_cv.pass.cpp
View File

@ -41,14 +41,14 @@ void do_insert_hint_test()
const VT v3(3, 3.5);
r = m.insert(m.end(), v3);
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3.5);
const VT v4(3, 4.5);
r = m.insert(prev(m.end()), v4);
assert(r == prev(m.end(), 2));
r = m.insert(std::prev(m.end()), v4);
assert(r == std::prev(m.end(), 2));
assert(m.size() == 4);
assert(r->first == 3);
assert(r->second == 4.5);

8
libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp
View File

@ -42,13 +42,13 @@ void do_insert_rv_test()
assert(r->second == 1);
r = m.insert(m.cend(), P(3, 3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3);
r = m.insert(m.cend(), P(3, 2));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(r->first == 3);
assert(r->second == 2);
@ -84,13 +84,13 @@ int main(int, char**)
assert(r->second == 1);
r = m.insert(m.cend(), {3, MoveOnly(3)});
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3);
r = m.insert(m.cend(), {3, MoveOnly(2)});
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(r->first == 3);
assert(r->second == 2);

8
libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp
View File

@ -42,13 +42,13 @@ void do_insert_rv_test()
assert(r->second == 1);
r = m.insert(VT(3, 3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3);
r = m.insert(VT(3, 3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(r->first == 3);
assert(r->second == 3);
@ -78,13 +78,13 @@ int main(int, char**)
assert(r->second == 1);
r = m.insert({3, MoveOnly(3)});
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3);
r = m.insert({3, MoveOnly(3)});
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(r->first == 3);
assert(r->second == 3);

4
libcxx/test/std/containers/associative/multiset/insert_cv.pass.cpp
View File

@ -39,12 +39,12 @@ void do_insert_cv_test()
const VT v3(3);
r = m.insert(v3);
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
r = m.insert(v3);
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(*r == 3);
}

8
libcxx/test/std/containers/associative/multiset/insert_iter_cv.pass.cpp
View File

@ -35,12 +35,12 @@ int main(int, char**)
assert(*r == 1);
r = m.insert(m.cend(), M::value_type(3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
r = m.insert(m.cend(), M::value_type(3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(*r == 3);
}
@ -60,12 +60,12 @@ int main(int, char**)
assert(*r == 1);
r = m.insert(m.cend(), M::value_type(3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
r = m.insert(m.cend(), M::value_type(3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(*r == 3);
}

8
libcxx/test/std/containers/associative/multiset/insert_iter_rv.pass.cpp
View File

@ -38,12 +38,12 @@ int main(int, char**)
assert(*r == 1);
r = m.insert(m.cend(), M::value_type(3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
r = m.insert(m.cend(), M::value_type(3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(*r == 3);
}
@ -62,12 +62,12 @@ int main(int, char**)
assert(*r == 1);
r = m.insert(m.cend(), M::value_type(3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
r = m.insert(m.cend(), M::value_type(3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(*r == 3);
}

8
libcxx/test/std/containers/associative/multiset/insert_rv.pass.cpp
View File

@ -38,12 +38,12 @@ int main(int, char**)
assert(*r == 1);
r = m.insert(M::value_type(3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
r = m.insert(M::value_type(3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(*r == 3);
}
@ -62,12 +62,12 @@ int main(int, char**)
assert(*r == 1);
r = m.insert(M::value_type(3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
r = m.insert(M::value_type(3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(*r == 3);
}

4
libcxx/test/std/containers/associative/set/insert_cv.pass.cpp
View File

@ -43,13 +43,13 @@ void do_insert_cv_test()
const VT v3(3);
r = m.insert(v3);
assert(r.second);
assert(r.first == prev(m.end()));
assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(*r.first == 3);
r = m.insert(v3);
assert(!r.second);
assert(r.first == prev(m.end()));
assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(*r.first == 3);
}

8
libcxx/test/std/containers/associative/set/insert_iter_cv.pass.cpp
View File

@ -35,12 +35,12 @@ int main(int, char**)
assert(*r == 1);
r = m.insert(m.cend(), M::value_type(3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
r = m.insert(m.cend(), M::value_type(3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
}
@ -60,12 +60,12 @@ int main(int, char**)
assert(*r == 1);
r = m.insert(m.cend(), M::value_type(3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
r = m.insert(m.cend(), M::value_type(3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
}

8
libcxx/test/std/containers/associative/set/insert_iter_rv.pass.cpp
View File

@ -38,12 +38,12 @@ int main(int, char**)
assert(*r == 1);
r = m.insert(m.cend(), M::value_type(3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
r = m.insert(m.cend(), M::value_type(3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
}
@ -62,12 +62,12 @@ int main(int, char**)
assert(*r == 1);
r = m.insert(m.cend(), M::value_type(3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
r = m.insert(m.cend(), M::value_type(3));
assert(r == prev(m.end()));
assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
}

8
libcxx/test/std/containers/associative/set/insert_rv.pass.cpp
View File

@ -41,13 +41,13 @@ int main(int, char**)
r = m.insert(M::value_type(3));
assert(r.second);
assert(r.first == prev(m.end()));
assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(*r.first == 3);
r = m.insert(M::value_type(3));
assert(!r.second);
assert(r.first == prev(m.end()));
assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(*r.first == 3);
}
@ -69,13 +69,13 @@ int main(int, char**)
r = m.insert(M::value_type(3));
assert(r.second);
assert(r.first == prev(m.end()));
assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(*r.first == 3);
r = m.insert(M::value_type(3));
assert(!r.second);
assert(r.first == prev(m.end()));
assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(*r.first == 3);
}