diff --git a/libcxx/test/libcxx/numerics/c.math/fdelayed-template-parsing.pass.cpp b/libcxx/test/libcxx/numerics/c.math/fdelayed-template-parsing.pass.cpp --- a/libcxx/test/libcxx/numerics/c.math/fdelayed-template-parsing.pass.cpp +++ b/libcxx/test/libcxx/numerics/c.math/fdelayed-template-parsing.pass.cpp @@ -14,8 +14,6 @@ #include #include -#include "test_macros.h" - int main(int, char**) { assert(std::isfinite(1.0)); assert(!std::isinf(1.0)); @@ -23,5 +21,3 @@ return 0; } - -using namespace std; diff --git a/libcxx/test/std/containers/associative/map/map.access/index_tuple.pass.cpp b/libcxx/test/std/containers/associative/map/map.access/index_tuple.pass.cpp --- a/libcxx/test/std/containers/associative/map/map.access/index_tuple.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.access/index_tuple.pass.cpp @@ -17,18 +17,11 @@ // https://llvm.org/PR16542 #include - - #include -#include "test_macros.h" - - -int main(int, char**) -{ - using namespace std; - map, size_t> m; - m[make_tuple(2,3)]=7; +int main(int, char**) { + std::map, std::size_t> m; + m[std::make_tuple(2, 3)] = 7; - return 0; + return 0; } diff --git a/libcxx/test/std/containers/unord/unord.map/unord.map.elem/index_tuple.pass.cpp b/libcxx/test/std/containers/unord/unord.map/unord.map.elem/index_tuple.pass.cpp --- a/libcxx/test/std/containers/unord/unord.map/unord.map.elem/index_tuple.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.map/unord.map.elem/index_tuple.pass.cpp @@ -21,19 +21,13 @@ #include #include -#include "test_macros.h" - -using namespace std; - -struct my_hash -{ - size_t operator()(const tuple&) const {return 0;} +struct my_hash { + std::size_t operator()(const std::tuple&) const { return 0; } }; -int main(int, char**) -{ - unordered_map, size_t, my_hash> m; - m[make_tuple(2,3)]=7; +int main(int, char**) { + std::unordered_map, size_t, my_hash> m; + m[std::make_tuple(2, 3)] = 7; - return 0; + return 0; } diff --git a/libcxx/test/std/input.output/filesystems/class.path/path.nonmember/swap.pass.cpp b/libcxx/test/std/input.output/filesystems/class.path/path.nonmember/swap.pass.cpp --- a/libcxx/test/std/input.output/filesystems/class.path/path.nonmember/swap.pass.cpp +++ b/libcxx/test/std/input.output/filesystems/class.path/path.nonmember/swap.pass.cpp @@ -32,14 +32,11 @@ fs::path::string_type ps1 = p1.native(); fs::path::string_type ps2 = p2.native(); { - using namespace std; using namespace fs; ASSERT_NOEXCEPT(swap(p1, p2)); ASSERT_SAME_TYPE(void, decltype(swap(p1, p2))); } { DisableAllocationGuard g; - using namespace std; - using namespace fs; swap(p1, p2); assert(p1.native() == ps2); assert(p2.native() == ps1); diff --git a/libcxx/test/std/numerics/complex.number/complex.literals/literals2.pass.cpp b/libcxx/test/std/numerics/complex.number/complex.literals/literals2.pass.cpp --- a/libcxx/test/std/numerics/complex.number/complex.literals/literals2.pass.cpp +++ b/libcxx/test/std/numerics/complex.number/complex.literals/literals2.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++03, c++11 -// +// #include #include diff --git a/libcxx/test/std/re/re.const/re.matchflag/match_prev_avail.pass.cpp b/libcxx/test/std/re/re.const/re.matchflag/match_prev_avail.pass.cpp --- a/libcxx/test/std/re/re.const/re.matchflag/match_prev_avail.pass.cpp +++ b/libcxx/test/std/re/re.const/re.matchflag/match_prev_avail.pass.cpp @@ -13,70 +13,72 @@ // match_not_bol and match_not_bow shall be ignored by the regular // expression algorithms (30.11) and iterators (30.12) -#include #include -using namespace std; + +#include +#include int main(int, char**) { char str1[] = "\na"; auto str1_scnd = str1 + 1; + // Assert that match_prev_avail disables match_not_bol and this matches - assert(regex_match(str1 + 1, str1 + 2, regex("^a"), - regex_constants::match_not_bol | - regex_constants::match_prev_avail)); + assert(std::regex_match(str1 + 1, str1 + 2, std::regex("^a"), + std::regex_constants::match_not_bol | + std::regex_constants::match_prev_avail)); // Manually passing match_prev_avail defines that --str1 is a valid position - assert(regex_match(str1_scnd, regex("a"), - regex_constants::match_not_bol | - regex_constants::match_prev_avail)); + assert(std::regex_match(str1_scnd, std::regex("a"), + std::regex_constants::match_not_bol | + std::regex_constants::match_prev_avail)); //Assert that match_prev_avail disables match_not_bow and this matches - assert(regex_search(str1, regex("\\ba"))); - assert(regex_match(str1 + 1, str1 + 2, regex("\\ba\\b"), - regex_constants::match_not_bow | - regex_constants::match_prev_avail)); - assert(regex_search(str1_scnd, regex("\\ba"), - regex_constants::match_not_bow | - regex_constants::match_prev_avail)); + assert(std::regex_search(str1, std::regex("\\ba"))); + assert(std::regex_match(str1 + 1, str1 + 2, std::regex("\\ba\\b"), + std::regex_constants::match_not_bow | + std::regex_constants::match_prev_avail)); + assert(std::regex_search(str1_scnd, std::regex("\\ba"), + std::regex_constants::match_not_bow | + std::regex_constants::match_prev_avail)); //Assert that match_prev_avail disables both match_not_bow and match_not_bol - assert(regex_match(str1 + 1, str1 + 2, regex("^a"), - regex_constants::match_not_bol | - regex_constants::match_not_bow | - regex_constants::match_prev_avail)); - assert(regex_match(str1_scnd, regex("\\ba"), - regex_constants::match_not_bol | - regex_constants::match_not_bow | - regex_constants::match_prev_avail)); + assert(std::regex_match(str1 + 1, str1 + 2, std::regex("^a"), + std::regex_constants::match_not_bol | + std::regex_constants::match_not_bow | + std::regex_constants::match_prev_avail)); + assert(std::regex_match(str1_scnd, std::regex("\\ba"), + std::regex_constants::match_not_bol | + std::regex_constants::match_not_bow | + std::regex_constants::match_prev_avail)); // pr 42199 - string S = " cd"; - string::iterator Start = S.begin() + 1; - string::iterator End = S.end(); - assert(regex_search(Start, End, regex("^cd"))); + std::string S = " cd"; + std::string::iterator Start = S.begin() + 1; + std::string::iterator End = S.end(); + assert(std::regex_search(Start, End, std::regex("^cd"))); - assert( - !regex_search(Start, End, regex("^cd"), regex_constants::match_not_bol)); - assert(!regex_search(Start, End, regex(".*\\bcd\\b"), - regex_constants::match_not_bow)); - assert(!regex_search(Start, End, regex("^cd"), - regex_constants::match_not_bol | - regex_constants::match_not_bow)); - assert(!regex_search(Start, End, regex(".*\\bcd\\b"), - regex_constants::match_not_bol | - regex_constants::match_not_bow)); + assert(!std::regex_search(Start, End, std::regex("^cd"), + std::regex_constants::match_not_bol)); + assert(!std::regex_search(Start, End, std::regex(".*\\bcd\\b"), + std::regex_constants::match_not_bow)); + assert(!std::regex_search(Start, End, std::regex("^cd"), + std::regex_constants::match_not_bol | + std::regex_constants::match_not_bow)); + assert(!std::regex_search(Start, End, std::regex(".*\\bcd\\b"), + std::regex_constants::match_not_bol | + std::regex_constants::match_not_bow)); - assert(regex_search(Start, End, regex("^cd"), - regex_constants::match_prev_avail)); + assert(std::regex_search(Start, End, std::regex("^cd"), + std::regex_constants::match_prev_avail)); - assert(regex_search(Start, End, regex("^cd"), - regex_constants::match_not_bol | - regex_constants::match_prev_avail)); - assert(regex_search(Start, End, regex("^cd"), - regex_constants::match_not_bow | - regex_constants::match_prev_avail)); - assert(regex_match(Start, End, regex("\\bcd\\b"), - regex_constants::match_not_bol | - regex_constants::match_not_bow | - regex_constants::match_prev_avail)); + assert(std::regex_search(Start, End, std::regex("^cd"), + std::regex_constants::match_not_bol | + std::regex_constants::match_prev_avail)); + assert(std::regex_search(Start, End, std::regex("^cd"), + std::regex_constants::match_not_bow | + std::regex_constants::match_prev_avail)); + assert(std::regex_match(Start, End, std::regex("\\bcd\\b"), + std::regex_constants::match_not_bol | + std::regex_constants::match_not_bow | + std::regex_constants::match_prev_avail)); return 0; } diff --git a/libcxx/test/std/strings/basic.string.literals/literal3.pass.cpp b/libcxx/test/std/strings/basic.string.literals/literal3.pass.cpp --- a/libcxx/test/std/strings/basic.string.literals/literal3.pass.cpp +++ b/libcxx/test/std/strings/basic.string.literals/literal3.pass.cpp @@ -10,15 +10,13 @@ // UNSUPPORTED: c++03, c++11 #include -#include - -#include "test_macros.h" -int main(int, char**) -{ - using namespace std; +#include - string foo = ""s; +int main(int, char**) { + using namespace std::literals; + std::string foo = ""s; + assert(foo == std::string()); - return 0; + return 0; } diff --git a/libcxx/test/std/strings/string.view/string_view.literals/literal3.pass.cpp b/libcxx/test/std/strings/string.view/string_view.literals/literal3.pass.cpp --- a/libcxx/test/std/strings/string.view/string_view.literals/literal3.pass.cpp +++ b/libcxx/test/std/strings/string.view/string_view.literals/literal3.pass.cpp @@ -12,16 +12,13 @@ // Note: libc++ supports string_view before C++17, but literals were introduced in C++14 #include -#include - -#include "test_macros.h" -int main(int, char**) -{ - using namespace std; +#include - string_view foo = ""sv; +int main(int, char**) { + using namespace std::literals; + std::string_view foo = ""sv; assert(foo.length() == 0); - return 0; + return 0; } diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/function.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/function.pass.cpp --- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/function.pass.cpp +++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/function.pass.cpp @@ -13,8 +13,6 @@ #include #include "test_macros.h" -using namespace std; - class Class {}; enum Enum1 {}; diff --git a/libcxx/test/support/any_helpers.h b/libcxx/test/support/any_helpers.h --- a/libcxx/test/support/any_helpers.h +++ b/libcxx/test/support/any_helpers.h @@ -52,10 +52,9 @@ // of type 'LastType' check that it can no longer be accessed. template void assertEmpty(std::any const& a) { - using namespace std; assert(!a.has_value()); RTTI_ASSERT(a.type() == typeid(void)); - assert(any_cast(&a) == nullptr); + assert(std::any_cast(&a) == nullptr); } template @@ -89,11 +88,9 @@ template _LIBCPP_AVAILABILITY_THROW_BAD_ANY_CAST void modifyValue(std::any& a, int value) { - using namespace std; - using namespace std::experimental; assert(a.has_value()); assert(containsType(a)); - any_cast(a).value = value; + std::any_cast(a).value = value; } // A test type that will trigger the small object optimization within 'any'. @@ -422,11 +419,9 @@ template void assertArgsMatch(std::any const& a) { - using namespace std; - using namespace std::experimental; assert(a.has_value()); assert(containsType(a)); - assert(any_cast(a).arg_types == &makeArgumentID()); + assert(std::any_cast(a).arg_types == &makeArgumentID()); };