+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])
<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>
// 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
* 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
// 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
#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>,
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
// 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
#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>,
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
// 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
#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>,
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
// 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
#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>,
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
-// 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
// { dg-do compile }
// libstdc++/21770
+namespace debug = __gnu_debug;
template class debug::basic_string<int, std::char_traits<int>,
std::allocator<char> >;
-// 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
// libstdc++/16020
void test01()
{
- using debug::bitset;
+ using __gnu_debug::bitset;
bool test __attribute__((unused)) = true;
bitset<5> b(7);
// 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
#include <debug/bitset>
#include <testsuite_hooks.h>
-using debug::bitset;
+using __gnu_debug::bitset;
bool test = true;
-// 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
// libstdc++/13838
void test01()
{
- using debug::bitset;
+ using __gnu_debug::bitset;
bool test __attribute__((unused)) = true;
bitset<4> b0, b1;
// 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
#include <debug/deque>
#include <testsuite_hooks.h>
-using debug::deque;
+using __gnu_debug::deque;
bool test = true;
// 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
#include <debug/deque>
#include <testsuite_hooks.h>
-using debug::deque;
+using __gnu_debug::deque;
bool test = true;
// 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
#include <debug/deque>
#include <testsuite_hooks.h>
-using debug::deque;
+using __gnu_debug::deque;
bool test = true;
// 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
#include <debug/deque>
#include <testsuite_hooks.h>
-using debug::deque;
+using __gnu_debug::deque;
bool test = true;
// 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
#include <iterator>
#include <testsuite_hooks.h>
-using debug::list;
+using __gnu_debug::list;
using std::advance;
bool test = true;
// 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
#include <iterator>
#include <testsuite_hooks.h>
-using debug::list;
+using __gnu_debug::list;
using std::advance;
bool test = true;
// 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
#include <iterator>
#include <testsuite_hooks.h>
-using debug::list;
+using __gnu_debug::list;
using std::advance;
bool test = true;
// 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
#include <iterator>
#include <testsuite_hooks.h>
-using debug::list;
+using __gnu_debug::list;
using std::advance;
bool test = true;
// 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
#include <iterator>
#include <testsuite_hooks.h>
-using debug::map;
+using __gnu_debug::map;
using std::advance;
bool test = true;
// 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
#include <iterator>
#include <testsuite_hooks.h>
-using debug::map;
+using __gnu_debug::map;
using std::advance;
bool test = true;
-// 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
// libstdc++/16813
void test01()
{
- using debug::map;
+ using __gnu_debug::map;
bool test __attribute__((unused)) = true;
map<int, float> m1, m2;
// 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
#include <testsuite_hooks.h>
#include <utility>
-using debug::multimap;
+using __gnu_debug::multimap;
using std::advance;
bool test = true;
// 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
#include <testsuite_hooks.h>
#include <utility>
-using debug::multimap;
+using __gnu_debug::multimap;
using std::advance;
bool test = true;
// 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
#include <iterator>
#include <testsuite_hooks.h>
-using debug::multiset;
+using __gnu_debug::multiset;
using std::advance;
bool test = true;
// 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
#include <iterator>
#include <testsuite_hooks.h>
-using debug::multiset;
+using __gnu_debug::multiset;
using std::advance;
// Erase
// 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
#include <iterator>
#include <testsuite_hooks.h>
-using debug::set;
+using __gnu_debug::set;
using std::advance;
bool test = true;
// 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
#include <iterator>
#include <testsuite_hooks.h>
-using debug::set;
+using __gnu_debug::set;
using std::advance;
// Erase
// 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
#include <debug/vector>
#include <testsuite_hooks.h>
-using debug::vector;
+using __gnu_debug::vector;
bool test = true;
// 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
#include <debug/vector>
#include <testsuite_hooks.h>
-using debug::vector;
+using __gnu_debug::vector;
bool test = true;
// 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
#include <debug/vector>
#include <testsuite_hooks.h>
-using debug::vector;
+using __gnu_debug::vector;
bool test = true;
// 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
#include <debug/vector>
#include <testsuite_hooks.h>
-using debug::vector;
+using __gnu_debug::vector;
bool test = true;
projects / thirdparty / gcc.git / commitdiff
