diff options
Diffstat (limited to 'libstdc++-v3/testsuite')
30 files changed, 45 insertions, 41 deletions
diff --git a/libstdc++-v3/testsuite/20_util/memory/auto_ptr/assign_neg.cc b/libstdc++-v3/testsuite/20_util/memory/auto_ptr/assign_neg.cc index cf4041df130..cab11c973dc 100644 --- a/libstdc++-v3/testsuite/20_util/memory/auto_ptr/assign_neg.cc +++ b/libstdc++-v3/testsuite/20_util/memory/auto_ptr/assign_neg.cc @@ -47,4 +47,4 @@ main() return 0; } // { dg-error "candidates" "" { target *-*-* } 223 } -// { dg-error "std::auto_ptr" "" { target *-*-* } 353 } +// { dg-error "::auto_ptr" "" { target *-*-* } 353 } diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/2.cc index ed539e06df7..8c6c687554c 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/2.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/2.cc @@ -32,5 +32,5 @@ // { dg-do compile } // libstdc++/21770 -template class __gnu_debug::basic_string<int, std::char_traits<int>, - std::allocator<char> >; +template class debug::basic_string<int, std::char_traits<int>, + std::allocator<char> >; diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/16020.cc b/libstdc++-v3/testsuite/23_containers/bitset/cons/16020.cc index f70a4b8730d..af24d041730 100644 --- a/libstdc++-v3/testsuite/23_containers/bitset/cons/16020.cc +++ b/libstdc++-v3/testsuite/23_containers/bitset/cons/16020.cc @@ -22,7 +22,7 @@ // libstdc++/16020 void test01() { - using __gnu_debug::bitset; + using debug::bitset; bool test __attribute__((unused)) = true; bitset<5> b(7); diff --git a/libstdc++-v3/testsuite/23_containers/bitset/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/bitset/invalidation/1.cc index d5a36748dad..0be47f25dd7 100644 --- a/libstdc++-v3/testsuite/23_containers/bitset/invalidation/1.cc +++ b/libstdc++-v3/testsuite/23_containers/bitset/invalidation/1.cc @@ -21,7 +21,7 @@ #include <debug/bitset> #include <testsuite_hooks.h> -using __gnu_debug::bitset; +using debug::bitset; bool test = true; diff --git a/libstdc++-v3/testsuite/23_containers/bitset/operations/13838.cc b/libstdc++-v3/testsuite/23_containers/bitset/operations/13838.cc index 4df035e52b7..7bb66887392 100644 --- a/libstdc++-v3/testsuite/23_containers/bitset/operations/13838.cc +++ b/libstdc++-v3/testsuite/23_containers/bitset/operations/13838.cc @@ -22,7 +22,7 @@ // libstdc++/13838 void test01() { - using __gnu_debug::bitset; + using debug::bitset; bool test __attribute__((unused)) = true; bitset<4> b0, b1; diff --git a/libstdc++-v3/testsuite/23_containers/deque/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/deque/invalidation/1.cc index 963673a92e7..83f69dddcf6 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/invalidation/1.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/invalidation/1.cc @@ -21,7 +21,7 @@ #include <debug/deque> #include <testsuite_hooks.h> -using __gnu_debug::deque; +using debug::deque; bool test = true; diff --git a/libstdc++-v3/testsuite/23_containers/deque/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/deque/invalidation/2.cc index 39f4ac77a6c..2e179f57ea1 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/invalidation/2.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/invalidation/2.cc @@ -21,7 +21,7 @@ #include <debug/deque> #include <testsuite_hooks.h> -using __gnu_debug::deque; +using debug::deque; bool test = true; diff --git a/libstdc++-v3/testsuite/23_containers/deque/invalidation/3.cc b/libstdc++-v3/testsuite/23_containers/deque/invalidation/3.cc index 96759dafcaa..f7abfcf01b2 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/invalidation/3.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/invalidation/3.cc @@ -21,7 +21,7 @@ #include <debug/deque> #include <testsuite_hooks.h> -using __gnu_debug::deque; +using debug::deque; bool test = true; diff --git a/libstdc++-v3/testsuite/23_containers/deque/invalidation/4.cc b/libstdc++-v3/testsuite/23_containers/deque/invalidation/4.cc index 40ee6a2b949..1ee306188fb 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/invalidation/4.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/invalidation/4.cc @@ -21,7 +21,7 @@ #include <debug/deque> #include <testsuite_hooks.h> -using __gnu_debug::deque; +using debug::deque; bool test = true; diff --git a/libstdc++-v3/testsuite/23_containers/list/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/list/invalidation/1.cc index 940d9aadb6b..3ae8525c26a 100644 --- a/libstdc++-v3/testsuite/23_containers/list/invalidation/1.cc +++ b/libstdc++-v3/testsuite/23_containers/list/invalidation/1.cc @@ -22,7 +22,7 @@ #include <iterator> #include <testsuite_hooks.h> -using __gnu_debug::list; +using debug::list; using std::advance; bool test = true; diff --git a/libstdc++-v3/testsuite/23_containers/list/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/list/invalidation/2.cc index 242e18c7208..9889c511a61 100644 --- a/libstdc++-v3/testsuite/23_containers/list/invalidation/2.cc +++ b/libstdc++-v3/testsuite/23_containers/list/invalidation/2.cc @@ -22,7 +22,7 @@ #include <iterator> #include <testsuite_hooks.h> -using __gnu_debug::list; +using debug::list; using std::advance; bool test = true; diff --git a/libstdc++-v3/testsuite/23_containers/list/invalidation/3.cc b/libstdc++-v3/testsuite/23_containers/list/invalidation/3.cc index b19e2c62608..a224123a83e 100644 --- a/libstdc++-v3/testsuite/23_containers/list/invalidation/3.cc +++ b/libstdc++-v3/testsuite/23_containers/list/invalidation/3.cc @@ -22,7 +22,7 @@ #include <iterator> #include <testsuite_hooks.h> -using __gnu_debug::list; +using debug::list; using std::advance; bool test = true; diff --git a/libstdc++-v3/testsuite/23_containers/list/invalidation/4.cc b/libstdc++-v3/testsuite/23_containers/list/invalidation/4.cc index 4d5465ce27b..2da08675a26 100644 --- a/libstdc++-v3/testsuite/23_containers/list/invalidation/4.cc +++ b/libstdc++-v3/testsuite/23_containers/list/invalidation/4.cc @@ -22,7 +22,7 @@ #include <iterator> #include <testsuite_hooks.h> -using __gnu_debug::list; +using debug::list; using std::advance; bool test = true; diff --git a/libstdc++-v3/testsuite/23_containers/map/insert/16813.cc b/libstdc++-v3/testsuite/23_containers/map/insert/16813.cc index c2bf4f0fd43..1132aad7748 100644 --- a/libstdc++-v3/testsuite/23_containers/map/insert/16813.cc +++ b/libstdc++-v3/testsuite/23_containers/map/insert/16813.cc @@ -22,7 +22,7 @@ // libstdc++/16813 void test01() { - using __gnu_debug::map; + using debug::map; bool test __attribute__((unused)) = true; map<int, float> m1, m2; diff --git a/libstdc++-v3/testsuite/23_containers/map/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/map/invalidation/1.cc index 9965c850d31..b3665e6e116 100644 --- a/libstdc++-v3/testsuite/23_containers/map/invalidation/1.cc +++ b/libstdc++-v3/testsuite/23_containers/map/invalidation/1.cc @@ -22,7 +22,7 @@ #include <iterator> #include <testsuite_hooks.h> -using __gnu_debug::map; +using debug::map; using std::advance; bool test = true; diff --git a/libstdc++-v3/testsuite/23_containers/map/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/map/invalidation/2.cc index fcb4601d1ce..9b596e4c64d 100644 --- a/libstdc++-v3/testsuite/23_containers/map/invalidation/2.cc +++ b/libstdc++-v3/testsuite/23_containers/map/invalidation/2.cc @@ -22,7 +22,7 @@ #include <iterator> #include <testsuite_hooks.h> -using __gnu_debug::map; +using debug::map; using std::advance; bool test = true; diff --git a/libstdc++-v3/testsuite/23_containers/multimap/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/multimap/invalidation/1.cc index ca6d2536e22..c2ae547a2fb 100644 --- a/libstdc++-v3/testsuite/23_containers/multimap/invalidation/1.cc +++ b/libstdc++-v3/testsuite/23_containers/multimap/invalidation/1.cc @@ -23,7 +23,7 @@ #include <testsuite_hooks.h> #include <utility> -using __gnu_debug::multimap; +using debug::multimap; using std::advance; bool test = true; diff --git a/libstdc++-v3/testsuite/23_containers/multimap/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/multimap/invalidation/2.cc index 11f998f384d..23ad5b31839 100644 --- a/libstdc++-v3/testsuite/23_containers/multimap/invalidation/2.cc +++ b/libstdc++-v3/testsuite/23_containers/multimap/invalidation/2.cc @@ -23,7 +23,7 @@ #include <testsuite_hooks.h> #include <utility> -using __gnu_debug::multimap; +using debug::multimap; using std::advance; bool test = true; diff --git a/libstdc++-v3/testsuite/23_containers/multiset/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/multiset/invalidation/1.cc index e9082d557d8..2ed58cc323f 100644 --- a/libstdc++-v3/testsuite/23_containers/multiset/invalidation/1.cc +++ b/libstdc++-v3/testsuite/23_containers/multiset/invalidation/1.cc @@ -22,7 +22,7 @@ #include <iterator> #include <testsuite_hooks.h> -using __gnu_debug::multiset; +using debug::multiset; using std::advance; bool test = true; diff --git a/libstdc++-v3/testsuite/23_containers/multiset/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/multiset/invalidation/2.cc index cb289b337c9..ac766156261 100644 --- a/libstdc++-v3/testsuite/23_containers/multiset/invalidation/2.cc +++ b/libstdc++-v3/testsuite/23_containers/multiset/invalidation/2.cc @@ -22,7 +22,7 @@ #include <iterator> #include <testsuite_hooks.h> -using __gnu_debug::multiset; +using debug::multiset; using std::advance; // Erase diff --git a/libstdc++-v3/testsuite/23_containers/set/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/set/invalidation/1.cc index bbf17be9aac..5cebadba64d 100644 --- a/libstdc++-v3/testsuite/23_containers/set/invalidation/1.cc +++ b/libstdc++-v3/testsuite/23_containers/set/invalidation/1.cc @@ -22,7 +22,7 @@ #include <iterator> #include <testsuite_hooks.h> -using __gnu_debug::set; +using debug::set; using std::advance; bool test = true; diff --git a/libstdc++-v3/testsuite/23_containers/set/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/set/invalidation/2.cc index cfe2f586aa7..6c3c8de5ec5 100644 --- a/libstdc++-v3/testsuite/23_containers/set/invalidation/2.cc +++ b/libstdc++-v3/testsuite/23_containers/set/invalidation/2.cc @@ -22,7 +22,7 @@ #include <iterator> #include <testsuite_hooks.h> -using __gnu_debug::set; +using debug::set; using std::advance; // Erase diff --git a/libstdc++-v3/testsuite/23_containers/vector/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/vector/invalidation/1.cc index a38e62860bc..8e5a1544150 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/1.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/1.cc @@ -28,7 +28,7 @@ #include <debug/vector> #include <testsuite_hooks.h> -using __gnu_debug::vector; +using debug::vector; bool test = true; diff --git a/libstdc++-v3/testsuite/23_containers/vector/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/vector/invalidation/2.cc index 674c21cb062..76b7849028b 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/2.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/2.cc @@ -28,7 +28,7 @@ #include <debug/vector> #include <testsuite_hooks.h> -using __gnu_debug::vector; +using debug::vector; bool test = true; diff --git a/libstdc++-v3/testsuite/23_containers/vector/invalidation/3.cc b/libstdc++-v3/testsuite/23_containers/vector/invalidation/3.cc index 05093835c9d..b182e046db4 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/3.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/3.cc @@ -28,7 +28,7 @@ #include <debug/vector> #include <testsuite_hooks.h> -using __gnu_debug::vector; +using debug::vector; bool test = true; diff --git a/libstdc++-v3/testsuite/23_containers/vector/invalidation/4.cc b/libstdc++-v3/testsuite/23_containers/vector/invalidation/4.cc index 9010f9e408d..540e60e47d5 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/4.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/4.cc @@ -28,7 +28,7 @@ #include <debug/vector> #include <testsuite_hooks.h> -using __gnu_debug::vector; +using debug::vector; bool test = true; diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index 0d9ba5ab4cb..d715d62175a 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -107,6 +107,8 @@ ENABLE_SYMVERS_DARWIN_FALSE = @ENABLE_SYMVERS_DARWIN_FALSE@ ENABLE_SYMVERS_DARWIN_TRUE = @ENABLE_SYMVERS_DARWIN_TRUE@ ENABLE_SYMVERS_FALSE = @ENABLE_SYMVERS_FALSE@ ENABLE_SYMVERS_GNU_FALSE = @ENABLE_SYMVERS_GNU_FALSE@ +ENABLE_SYMVERS_GNU_NAMESPACE_FALSE = @ENABLE_SYMVERS_GNU_NAMESPACE_FALSE@ +ENABLE_SYMVERS_GNU_NAMESPACE_TRUE = @ENABLE_SYMVERS_GNU_NAMESPACE_TRUE@ ENABLE_SYMVERS_GNU_TRUE = @ENABLE_SYMVERS_GNU_TRUE@ ENABLE_SYMVERS_TRUE = @ENABLE_SYMVERS_TRUE@ EXEEXT = @EXEEXT@ diff --git a/libstdc++-v3/testsuite/ext/hash_map/1.cc b/libstdc++-v3/testsuite/ext/hash_map/1.cc index af018fca187..2062cb01b57 100644 --- a/libstdc++-v3/testsuite/ext/hash_map/1.cc +++ b/libstdc++-v3/testsuite/ext/hash_map/1.cc @@ -23,11 +23,10 @@ #include <ext/hash_map> #include <testsuite_hooks.h> -using namespace std; -using namespace __gnu_cxx; - namespace __gnu_cxx { + using std::string; + inline size_t hash_string(const char* s) { unsigned long h; @@ -63,19 +62,22 @@ namespace __gnu_cxx }; } - -const int Size = 5; - void test01() { + const int Size = 5; bool test __attribute__((unused)) = true; + using std::string; + using std::pair; + using std::vector; + using __gnu_cxx::hash_map; + for (int i = 0; i < 10; i++) { - hash_map<string,int> a; - hash_map<string,int> b; + hash_map<string, int> a; + hash_map<string, int> b; - vector<pair<string,int> > contents (Size); + vector<pair<string, int> > contents (Size); for (int j = 0; j < Size; j++) { string s; diff --git a/libstdc++-v3/testsuite/ext/hash_map/14648.cc b/libstdc++-v3/testsuite/ext/hash_map/14648.cc index e78e1c0b76f..91f8240e150 100644 --- a/libstdc++-v3/testsuite/ext/hash_map/14648.cc +++ b/libstdc++-v3/testsuite/ext/hash_map/14648.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004 Free Software Foundation +// Copyright (C) 2004, 2005 Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -23,14 +23,13 @@ // libstdc++/14648 void test01() { - using namespace std; using namespace __gnu_cxx; - typedef hash_map<char, crope, hash<char>, equal_to<char> > maptype; + typedef hash_map<char, crope, hash<char>, std::equal_to<char> > maptype; maptype m; m['l'] = "50"; m['x'] = "10"; - cout << "m['x'] = " << m['x'] << endl; + std::cout << "m['x'] = " << m['x'] << std::endl; } int main() diff --git a/libstdc++-v3/testsuite/testsuite_character.h b/libstdc++-v3/testsuite/testsuite_character.h index 3d6a3f2d1c2..c43db15e4c3 100644 --- a/libstdc++-v3/testsuite/testsuite_character.h +++ b/libstdc++-v3/testsuite/testsuite_character.h @@ -74,7 +74,8 @@ namespace __gnu_test typedef character<unsigned int, unsigned long> pod_uint; } -namespace __gnu_cxx { +namespace __gnu_cxx +{ // Specializations. // pod_char template<> |