diff options
32 files changed, 139 insertions, 87 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 84e3993..38ae3c7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,44 @@ +2006-02-08 Benjamin Kosnik <bkoz@redhat.com> + + PR libstdc++/26142 + * include/debug/debug.h: Move debug alias inside namespace std, + same with namespace __gnu_cxx. Add top-level __gnu_debug + namespace. + * include/debug/hash_multimap.h: Nest within __gnu_cxx, not + std. Also, change nesting namespace name from __gnu_debug_def to + __gnu_debug. + * include/debug/hash_map.h: Same. + * include/debug/hash_multiset.h: Same. + * include/debug/hash_set.h: Same. + * docs/html/debug.html: Same. + * testsuite/23_containers/vector/26412.cc: New. + * testsuite/23_containers/vector/invalidation/1.cc: Correct + qualifications for debug namespace change. + * testsuite/23_containers/vector/invalidation/2.cc: Same. + * testsuite/23_containers/vector/invalidation/3.cc: Same. + * testsuite/23_containers/vector/invalidation/4.cc: Same. + * testsuite/23_containers/deque/invalidation/1.cc: Same. + * testsuite/23_containers/deque/invalidation/2.cc: Same. + * testsuite/23_containers/deque/invalidation/3.cc: Same. + * testsuite/23_containers/deque/invalidation/4.cc: Same. + * testsuite/23_containers/multiset/invalidation/1.cc: Same. + * testsuite/23_containers/multiset/invalidation/2.cc: Same. + * testsuite/23_containers/multimap/invalidation/1.cc: Same. + * testsuite/23_containers/multimap/invalidation/2.cc: Same. + * testsuite/23_containers/bitset/invalidation/1.cc: Same. + * testsuite/23_containers/bitset/cons/16020.cc: Same. + * testsuite/23_containers/bitset/operations/13838.cc: Same. + * testsuite/23_containers/list/invalidation/1.cc: Same. + * testsuite/23_containers/list/invalidation/2.cc: Same. + * testsuite/23_containers/list/invalidation/3.cc: Same. + * testsuite/23_containers/list/invalidation/4.cc: Same. + * testsuite/23_containers/set/invalidation/1.cc: Same. + * testsuite/23_containers/set/invalidation/2.cc: Same. + * testsuite/23_containers/map/invalidation/1.cc: Same. + * testsuite/23_containers/map/invalidation/2.cc: Same. + * testsuite/23_containers/map/modifiers/insert/16813.cc: Same. + * testsuite/21_strings/basic_string/2.cc: Same. + 2006-02-08 Paolo Carlini <pcarlini@suse.de> PR libstdc++/26133 (DR 241, [WP]) diff --git a/libstdc++-v3/docs/html/debug.html b/libstdc++-v3/docs/html/debug.html index 6bea7f4..f2f4c63 100644 --- a/libstdc++-v3/docs/html/debug.html +++ b/libstdc++-v3/docs/html/debug.html @@ -163,91 +163,91 @@ <tr> <td>std::bitset</td> <td><bitset></td> - <td>debug::bitset</td> + <td>__gnu_debug::bitset</td> <td><debug/bitset></td> </tr> <tr> <td>std::deque</td> <td><deque></td> - <td>debug::deque</td> + <td>__gnu_debug::deque</td> <td><debug/deque></td> </tr> <tr> <td>std::list</td> <td><list></td> - <td>debug::list</td> + <td>__gnu_debug::list</td> <td><debug/list></td> </tr> <tr> <td>std::map</td> <td><map></td> - <td>debug::map</td> + <td>__gnu_debug::map</td> <td><debug/map></td> </tr> <tr> <td>std::multimap</td> <td><map></td> - <td>debug::multimap</td> + <td>__gnu_debug::multimap</td> <td><debug/map></td> </tr> <tr> <td>std::multiset</td> <td><set></td> - <td>debug::multiset</td> + <td>__gnu_debug::multiset</td> <td><debug/set></td> </tr> <tr> <td>std::set</td> <td><set></td> - <td>debug::set</td> + <td>__gnu_debug::set</td> <td><debug/set></td> </tr> <tr> <td>std::string</td> <td><string></td> - <td>debug::string</td> + <td>__gnu_debug::string</td> <td><debug/string></td> </tr> <tr> <td>std::wstring</td> <td><string></td> - <td>debug::wstring</td> + <td>__gnu_debug::wstring</td> <td><debug/string></td> </tr> <tr> <td>std::basic_string</td> <td><string></td> - <td>debug::basic_string</td> + <td>__gnu_debug::basic_string</td> <td><debug/string></td> </tr> <tr> <td>std::vector</td> <td><vector></td> - <td>debug::vector</td> + <td>__gnu_debug::vector</td> <td><debug/vector></td> </tr> <tr> <td>__gnu_cxx::hash_map</td> <td><ext/hash_map></td> - <td>debug::hash_map</td> + <td>__gnu_debug::hash_map</td> <td><debug/hash_map></td> </tr> <tr> <td>__gnu_cxx::hash_multimap</td> <td><ext/hash_map></td> - <td>debug::hash_multimap</td> + <td>__gnu_debug::hash_multimap</td> <td><debug/hash_map></td> </tr> <tr> <td>__gnu_cxx::hash_set</td> <td><ext/hash_set></td> - <td>debug::hash_set</td> + <td>__gnu_debug::hash_set</td> <td><debug/hash_set></td> </tr> <tr> <td>__gnu_cxx::hash_multiset</td> <td><ext/hash_set></td> - <td>debug::hash_multiset</td> + <td>__gnu_debug::hash_multiset</td> <td><debug/hash_set></td> </tr> </table> diff --git a/libstdc++-v3/include/debug/debug.h b/libstdc++-v3/include/debug/debug.h index 4eff05b..e2aaf0f 100644 --- a/libstdc++-v3/include/debug/debug.h +++ b/libstdc++-v3/include/debug/debug.h @@ -1,6 +1,6 @@ // Debugging support implementation -*- C++ -*- -// Copyright (C) 2003, 2005 +// Copyright (C) 2003, 2005, 2006 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -39,14 +39,24 @@ * standard library algorithms. */ - namespace std { namespace __gnu_debug_def { } namespace __gnu_debug { using namespace __gnu_debug_def; } + namespace debug = __gnu_debug; +} + +namespace __gnu_cxx +{ + namespace __gnu_debug { }; + namespace debug = __gnu_debug; } -namespace debug = std::__gnu_debug; +namespace __gnu_debug +{ + using namespace std::debug; + using namespace __gnu_cxx::debug; +} #ifdef _GLIBCXX_DEBUG diff --git a/libstdc++-v3/include/debug/hash_map.h b/libstdc++-v3/include/debug/hash_map.h index e02b747..d431d7d 100644 --- a/libstdc++-v3/include/debug/hash_map.h +++ b/libstdc++-v3/include/debug/hash_map.h @@ -1,6 +1,6 @@ // Debugging hash_map implementation -*- C++ -*- -// Copyright (C) 2003, 2005 +// Copyright (C) 2003, 2005, 2006 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -34,9 +34,9 @@ #include <debug/safe_sequence.h> #include <debug/safe_iterator.h> -namespace std +namespace __gnu_cxx { -namespace __gnu_debug_def +namespace __gnu_debug { template<typename _Value, typename _Tp, typename _HashFcn = __gnu_cxx::hash<_Value>, @@ -267,7 +267,7 @@ namespace __gnu_debug_def swap(hash_map<_Value, _Tp, _HashFcn, _EqualKey, _Alloc>& __x, hash_map<_Value, _Tp, _HashFcn, _EqualKey, _Alloc>& __y) { __x.swap(__y); } -} // namespace __gnu_debug_def -} // namespace std +} // namespace __gnu_debug +} // namespace __gnu_cxx #endif diff --git a/libstdc++-v3/include/debug/hash_multimap.h b/libstdc++-v3/include/debug/hash_multimap.h index 5cce135..2073df0 100644 --- a/libstdc++-v3/include/debug/hash_multimap.h +++ b/libstdc++-v3/include/debug/hash_multimap.h @@ -1,6 +1,6 @@ // Debugging hash_multimap implementation -*- C++ -*- -// Copyright (C) 2003, 2005 +// Copyright (C) 2003, 2005, 2006 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -34,9 +34,9 @@ #include <debug/safe_sequence.h> #include <debug/safe_iterator.h> -namespace std +namespace __gnu_cxx { -namespace __gnu_debug_def +namespace __gnu_debug { template<typename _Value, typename _Tp, typename _HashFcn = __gnu_cxx::hash<_Value>, @@ -258,7 +258,7 @@ namespace __gnu_debug_def swap(hash_multimap<_Value, _Tp, _HashFcn, _EqualKey, _Alloc>& __x, hash_multimap<_Value, _Tp, _HashFcn, _EqualKey, _Alloc>& __y) { __x.swap(__y); } -} // namespace __gnu_debug_def -} // namespace std +} // namespace __gnu_debug +} // namespace __gnu_cxx #endif diff --git a/libstdc++-v3/include/debug/hash_multiset.h b/libstdc++-v3/include/debug/hash_multiset.h index 83d5619..7627afe 100644 --- a/libstdc++-v3/include/debug/hash_multiset.h +++ b/libstdc++-v3/include/debug/hash_multiset.h @@ -1,6 +1,6 @@ // Debugging hash_multiset implementation -*- C++ -*- -// Copyright (C) 2003, 2005 +// Copyright (C) 2003, 2005, 2006 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -34,9 +34,9 @@ #include <debug/safe_sequence.h> #include <debug/safe_iterator.h> -namespace std +namespace __gnu_cxx { -namespace __gnu_debug_def +namespace __gnu_debug { template<typename _Value, typename _HashFcn = __gnu_cxx::hash<_Value>, @@ -233,7 +233,7 @@ template<typename _Value, typename _HashFcn, typename _EqualKey, typename _Alloc swap(hash_multiset<_Value, _HashFcn, _EqualKey, _Alloc>& __x, hash_multiset<_Value, _HashFcn, _EqualKey, _Alloc>& __y) { __x.swap(__y); } -} // namespace __gnu_debug_def -} // namespace std +} // namespace __gnu_debug +} // namespace __gnu_cxx #endif diff --git a/libstdc++-v3/include/debug/hash_set.h b/libstdc++-v3/include/debug/hash_set.h index e1dd83b..f5477f0 100644 --- a/libstdc++-v3/include/debug/hash_set.h +++ b/libstdc++-v3/include/debug/hash_set.h @@ -1,6 +1,6 @@ // Debugging hash_set implementation -*- C++ -*- -// Copyright (C) 2003, 2005 +// Copyright (C) 2003, 2005, 2006 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -34,9 +34,9 @@ #include <debug/safe_sequence.h> #include <debug/safe_iterator.h> -namespace std +namespace __gnu_cxx { -namespace __gnu_debug_def +namespace __gnu_debug { template<typename _Value, typename _HashFcn = __gnu_cxx::hash<_Value>, @@ -242,7 +242,7 @@ namespace __gnu_debug_def swap(hash_set<_Value, _HashFcn, _EqualKey, _Alloc>& __x, hash_set<_Value, _HashFcn, _EqualKey, _Alloc>& __y) { __x.swap(__y); } -} // namespace __gnu_debug_def -} // namespace std +} // namespace __gnu_debug +} // namespace __gnu_cxx #endif diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/2.cc index 8c6c687..8b02175 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/2.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/2.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2005 Free Software Foundation, Inc. +// Copyright (C) 2005, 2006 Free Software Foundation, Inc. // // 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 @@ -32,5 +32,6 @@ // { dg-do compile } // libstdc++/21770 +namespace debug = __gnu_debug; 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 af24d04..f062081 100644 --- a/libstdc++-v3/testsuite/23_containers/bitset/cons/16020.cc +++ b/libstdc++-v3/testsuite/23_containers/bitset/cons/16020.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004 Free Software Foundation, Inc. +// Copyright (C) 2004, 2006 Free Software Foundation, Inc. // // 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 @@ -22,7 +22,7 @@ // libstdc++/16020 void test01() { - using debug::bitset; + using __gnu_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 0be47f2..176bce1 100644 --- a/libstdc++-v3/testsuite/23_containers/bitset/invalidation/1.cc +++ b/libstdc++-v3/testsuite/23_containers/bitset/invalidation/1.cc @@ -1,6 +1,6 @@ // Bitset reference invalidation tests -// Copyright (C) 2003, 2004 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc. // // 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 @@ -21,7 +21,7 @@ #include <debug/bitset> #include <testsuite_hooks.h> -using debug::bitset; +using __gnu_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 7bb6688..a3cfa15 100644 --- a/libstdc++-v3/testsuite/23_containers/bitset/operations/13838.cc +++ b/libstdc++-v3/testsuite/23_containers/bitset/operations/13838.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004 Free Software Foundation, Inc. +// Copyright (C) 2004, 2006 Free Software Foundation, Inc. // // 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 @@ -22,7 +22,7 @@ // libstdc++/13838 void test01() { - using debug::bitset; + using __gnu_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 83f69dd..6f31d14 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/invalidation/1.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/invalidation/1.cc @@ -1,6 +1,6 @@ // Deque iterator invalidation tests -// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. // // 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 @@ -21,7 +21,7 @@ #include <debug/deque> #include <testsuite_hooks.h> -using debug::deque; +using __gnu_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 2e179f5..b397afe 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/invalidation/2.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/invalidation/2.cc @@ -1,6 +1,6 @@ // Deque iterator invalidation tests -// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. // // 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 @@ -21,7 +21,7 @@ #include <debug/deque> #include <testsuite_hooks.h> -using debug::deque; +using __gnu_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 f7abfcf..3ed3a8a 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/invalidation/3.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/invalidation/3.cc @@ -1,6 +1,6 @@ // Deque iterator invalidation tests -// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. // // 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 @@ -21,7 +21,7 @@ #include <debug/deque> #include <testsuite_hooks.h> -using debug::deque; +using __gnu_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 1ee30618..dbb2061 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/invalidation/4.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/invalidation/4.cc @@ -1,6 +1,6 @@ // Deque iterator invalidation tests -// Copyright (C) 2003, 2005 Free Software Foundation, Inc. +// Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc. // // 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 @@ -21,7 +21,7 @@ #include <debug/deque> #include <testsuite_hooks.h> -using debug::deque; +using __gnu_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 3ae8525..94cb29d 100644 --- a/libstdc++-v3/testsuite/23_containers/list/invalidation/1.cc +++ b/libstdc++-v3/testsuite/23_containers/list/invalidation/1.cc @@ -1,6 +1,6 @@ // List iterator invalidation tests -// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. // // 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 @@ -22,7 +22,7 @@ #include <iterator> #include <testsuite_hooks.h> -using debug::list; +using __gnu_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 9889c51..2aebcf5 100644 --- a/libstdc++-v3/testsuite/23_containers/list/invalidation/2.cc +++ b/libstdc++-v3/testsuite/23_containers/list/invalidation/2.cc @@ -1,6 +1,6 @@ // List iterator invalidation tests -// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. // // 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 @@ -22,7 +22,7 @@ #include <iterator> #include <testsuite_hooks.h> -using debug::list; +using __gnu_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 a224123..a0edd20 100644 --- a/libstdc++-v3/testsuite/23_containers/list/invalidation/3.cc +++ b/libstdc++-v3/testsuite/23_containers/list/invalidation/3.cc @@ -1,6 +1,6 @@ // List iterator invalidation tests -// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. // // 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 @@ -22,7 +22,7 @@ #include <iterator> #include <testsuite_hooks.h> -using debug::list; +using __gnu_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 2da0867..04f0d25 100644 --- a/libstdc++-v3/testsuite/23_containers/list/invalidation/4.cc +++ b/libstdc++-v3/testsuite/23_containers/list/invalidation/4.cc @@ -1,6 +1,6 @@ // List iterator invalidation tests -// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. // // 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 @@ -22,7 +22,7 @@ #include <iterator> #include <testsuite_hooks.h> -using debug::list; +using __gnu_debug::list; using std::advance; bool test = true; diff --git a/libstdc++-v3/testsuite/23_containers/map/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/map/invalidation/1.cc index b3665e6..733440d 100644 --- a/libstdc++-v3/testsuite/23_containers/map/invalidation/1.cc +++ b/libstdc++-v3/testsuite/23_containers/map/invalidation/1.cc @@ -1,6 +1,6 @@ // Map iterator invalidation tests -// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. // // 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 @@ -22,7 +22,7 @@ #include <iterator> #include <testsuite_hooks.h> -using debug::map; +using __gnu_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 9b596e4..8e6eca9 100644 --- a/libstdc++-v3/testsuite/23_containers/map/invalidation/2.cc +++ b/libstdc++-v3/testsuite/23_containers/map/invalidation/2.cc @@ -1,6 +1,6 @@ // Map iterator invalidation tests -// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. // // 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 @@ -22,7 +22,7 @@ #include <iterator> #include <testsuite_hooks.h> -using debug::map; +using __gnu_debug::map; using std::advance; bool test = true; diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/16813.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/16813.cc index 1132aad..322231c 100644 --- a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/16813.cc +++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/16813.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004 Free Software Foundation, Inc. +// Copyright (C) 2004, 2006 Free Software Foundation, Inc. // // 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 @@ -22,7 +22,7 @@ // libstdc++/16813 void test01() { - using debug::map; + using __gnu_debug::map; bool test __attribute__((unused)) = true; map<int, float> m1, m2; diff --git a/libstdc++-v3/testsuite/23_containers/multimap/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/multimap/invalidation/1.cc index c2ae547..c58bfc4 100644 --- a/libstdc++-v3/testsuite/23_containers/multimap/invalidation/1.cc +++ b/libstdc++-v3/testsuite/23_containers/multimap/invalidation/1.cc @@ -1,6 +1,6 @@ // Multimap iterator invalidation tests -// Copyright (C) 2003, 2005 Free Software Foundation, Inc. +// Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc. // // 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,7 +23,7 @@ #include <testsuite_hooks.h> #include <utility> -using debug::multimap; +using __gnu_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 23ad5b3..7ac1672 100644 --- a/libstdc++-v3/testsuite/23_containers/multimap/invalidation/2.cc +++ b/libstdc++-v3/testsuite/23_containers/multimap/invalidation/2.cc @@ -1,6 +1,6 @@ // Multimap iterator invalidation tests -// Copyright (C) 2003, 2005 Free Software Foundation, Inc. +// Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc. // // 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,7 +23,7 @@ #include <testsuite_hooks.h> #include <utility> -using debug::multimap; +using __gnu_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 2ed58cc..6e7aca1 100644 --- a/libstdc++-v3/testsuite/23_containers/multiset/invalidation/1.cc +++ b/libstdc++-v3/testsuite/23_containers/multiset/invalidation/1.cc @@ -1,6 +1,6 @@ // Multiset iterator invalidation tests -// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. // // 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 @@ -22,7 +22,7 @@ #include <iterator> #include <testsuite_hooks.h> -using debug::multiset; +using __gnu_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 ac76615..e7d5ad6 100644 --- a/libstdc++-v3/testsuite/23_containers/multiset/invalidation/2.cc +++ b/libstdc++-v3/testsuite/23_containers/multiset/invalidation/2.cc @@ -1,6 +1,6 @@ // Multiset iterator invalidation tests -// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. // // 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 @@ -22,7 +22,7 @@ #include <iterator> #include <testsuite_hooks.h> -using debug::multiset; +using __gnu_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 5cebadb..cf40510 100644 --- a/libstdc++-v3/testsuite/23_containers/set/invalidation/1.cc +++ b/libstdc++-v3/testsuite/23_containers/set/invalidation/1.cc @@ -1,6 +1,6 @@ // Set iterator invalidation tests -// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. // // 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 @@ -22,7 +22,7 @@ #include <iterator> #include <testsuite_hooks.h> -using debug::set; +using __gnu_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 6c3c8de..72d02bf 100644 --- a/libstdc++-v3/testsuite/23_containers/set/invalidation/2.cc +++ b/libstdc++-v3/testsuite/23_containers/set/invalidation/2.cc @@ -1,6 +1,6 @@ // Set iterator invalidation tests -// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. // // 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 @@ -22,7 +22,7 @@ #include <iterator> #include <testsuite_hooks.h> -using debug::set; +using __gnu_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 8e5a154..1a18d75 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/1.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/1.cc @@ -1,6 +1,6 @@ // Vector iterator invalidation tests -// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. // // 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 @@ -28,7 +28,7 @@ #include <debug/vector> #include <testsuite_hooks.h> -using debug::vector; +using __gnu_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 76b7849..368d4d7 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/2.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/2.cc @@ -1,6 +1,6 @@ // Vector iterator invalidation tests -// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. // // 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 @@ -28,7 +28,7 @@ #include <debug/vector> #include <testsuite_hooks.h> -using debug::vector; +using __gnu_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 b182e04..86ae756 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/3.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/3.cc @@ -1,6 +1,6 @@ // Vector iterator invalidation tests -// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. // // 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 @@ -28,7 +28,7 @@ #include <debug/vector> #include <testsuite_hooks.h> -using debug::vector; +using __gnu_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 540e60e..fb8a493 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/4.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/4.cc @@ -1,6 +1,6 @@ // Vector iterator invalidation tests -// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. // // 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 @@ -28,7 +28,7 @@ #include <debug/vector> #include <testsuite_hooks.h> -using debug::vector; +using __gnu_debug::vector; bool test = true; |