2007-10-18 Benjamin Kosnik <bkoz@redhat.com>

	* include/ext/hash_map: To...
	* include/backward/hash_map: ...here. Remove debug mode.
	* include/ext/hash_set: To...
	* include/backward/hash_set: ...here. Remove debug mode.
	* include/ext/hash_fun.h: To...
	* include/backward/hash_fun.h: ...here.
	* include/ext/hashtable.h: To...
	* include/backward/hashtable.h: ...here.
	
	* include/bits/c++config: Remove __gnu_cxx namespace from debug mode.
	* include/debug/debug.h: Same.
		
	* include/debug/hash_map: Remove.
	* include/debug/hash_multimap.h: Remove.
	* include/debug/hash_set.h: Remove.
	* include/debug/hash_set: Remove.
	* include/debug/hash_multiset.h: Remove.
	* include/debug/hash_map.h: Remove.
	
	* include/Makefile.am (ext_headers): Move hash_set, hash_map to
	backward.
	(debug_headers): Remove hash_map, hash_set, hash_map.h,
	hash_map.h, hash_multiset.h, hash_multimap.h.	
	* include/Makefile.in: Regenerate.

	* docs/html/debug.html: Update.
	* docs/html/ext/howto.html: Same.
	* docs/html/faq/index.html: Same.
	* docs/doxygen/Intro.3: Same.
	* docs/doxygen/user.cfg.in: Adjust includes.
	* testsuite/ext/hash_map: Move to...
	* testsuite/backward/hash_map: ...here.
	* testsuite/ext/hash_set: Move to...
	* testsuite/backward/hash_set: ...here.
	
2007-10-18  Benjamin Kosnik  <bkoz@redhat.com>
        
	Removal of pre-ISO C++ items from include/backwards.
	* include/Makefile.am (backward_headers): Remove all but strstream,
	backward_warning.h.
	* include/Makefile.in: Regenerate.
	* include/backward/new.h: Remove.
	* include/backward/iterator.h: Same.
	* include/backward/alloc.h: Same.
	* include/backward/set.h: Same.
	* include/backward/hashtable.h: Same.
	* include/backward/hash_set.h: Same.
	* include/backward/fstream.h: Same.
	* include/backward/tempbuf.h: Same.
	* include/backward/istream.h: Same.
	* include/backward/bvector.h: Same.
	* include/backward/stack.h: Same.
	* include/backward/rope.h: Same.
	* include/backward/complex.h: Same.
	* include/backward/ostream.h: Same.
	* include/backward/heap.h: Same.
	* include/backward/iostream.h: Same.
	* include/backward/function.h: Same.
	* include/backward/multimap.h: Same.
	* include/backward/pair.h: Same.
	* include/backward/stream.h: Same.
	* include/backward/iomanip.h: Same.
	* include/backward/slist.h: Same.
	* include/backward/tree.h: Same.
	* include/backward/vector.h: Same.
	* include/backward/deque.h: Same.
	* include/backward/multiset.h: Same.
	* include/backward/defalloc.h: Same.
	* include/backward/list.h: Same.
	* include/backward/map.h: Same.
	* include/backward/algobase.h: Same.
	* include/backward/hash_map.h: Same.
	* include/backward/algo.h: Same.
	* include/backward/queue.h: Same.
	* include/backward/streambuf.h: Same.
	* testsuite/backward/header_hash_set_h.cc: Same.
	* testsuite/backward/header_slist_h.cc: Same.
	* testsuite/backward/header_hash_map_h.cc: Same.
	* testsuite/backward/header_tempbuf_h.cc: Same.
	* testsuite/backward/header_deque_h.cc: Same.
	* testsuite/backward/header_rope_h.cc: Same.
	* testsuite/backward/header_iterator_h.cc: Same.
	* testsuite/backward/header_hashtable_h.cc: Same.

2007-10-18  Benjamin Kosnik  <bkoz@redhat.com>

	PR libstdc++/30085
	* include/debug/unordered_map: New.
	* include/debug/unordered_set: New.
	* include/debug/safe_association.h: New.	
	* include/std/unordered_map: Include debug header if _GLIBCXX_DEBUG.
	* include/std/unordered_set: Same.
	* include/Makefile.am (debug_headers): Add unordered_map,
	unordered_set, safe_association.h.
	* include/Makefile.in: Regenerate.
	* testsuite/23_containers/unordered_map/requirements/debug.cc: New.
	* testsuite/23_containers/unordered_multimap/requirements/
	debug.cc: New.
	* testsuite/23_containers/unordered_set/requirements/debug.cc: New.
	* testsuite/23_containers/unordered_multiset/requirements/
	debug.cc: New.

2007-10-18  Benjamin Kosnik  <bkoz@redhat.com>
	
	* testsuite/util/native_type/assoc/native_hash_multimap.hpp: Remove
	hash_map include.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@129442 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 48 insertions, 40 deletions

diff --git a/libstdc++-v3/docs/html/debug.html b/libstdc++-v3/docs/html/debug.html
index 6013115fe13..60e8418a634 100644
--- a/libstdc++-v3/docs/html/debug.html
+++ b/libstdc++-v3/docs/html/debug.html
@@ -231,29 +231,36 @@
     <td>__gnu_debug::vector</td>
     <td>&lt;debug/vector&gt;</td>
   </tr>
+</table>
+
+<p>In addition, when compiling in C++0x mode, these additional
+containers have additional debug capability.
+</p>
+
+<table>
   <tr>
-    <td>__gnu_cxx::hash_map</td>
-    <td>&lt;ext/hash_map&gt;</td>
-    <td>__gnu_debug::hash_map</td>
-    <td>&lt;debug/hash_map&gt;</td>
+    <td>std::unordered_map</td>
+    <td>&lt;unordered_map&gt;</td>
+    <td>__gnu_debug::unordered_map</td>
+    <td>&lt;debug/unordered_map&gt;</td>
   </tr>
   <tr>
-    <td>__gnu_cxx::hash_multimap</td>
-    <td>&lt;ext/hash_map&gt;</td>
-    <td>__gnu_debug::hash_multimap</td>
-    <td>&lt;debug/hash_map&gt;</td>
+    <td>std::unordered_multimap</td>
+    <td>&lt;unordered_map&gt;</td>
+    <td>__gnu_debug::unordered_multimap</td>
+    <td>&lt;debug/unordered_map&gt;</td>
   </tr>
   <tr>
-    <td>__gnu_cxx::hash_set</td>
-    <td>&lt;ext/hash_set&gt;</td>
-    <td>__gnu_debug::hash_set</td>
-    <td>&lt;debug/hash_set&gt;</td>
+    <td>std::unordered_set</td>
+    <td>&lt;unordered_set&gt;</td>
+    <td>__gnu_debug::unordered_set</td>
+    <td>&lt;debug/unordered_set&gt;</td>
   </tr>
   <tr>
-    <td>__gnu_cxx::hash_multiset</td>
-    <td>&lt;ext/hash_set&gt;</td>
-    <td>__gnu_debug::hash_multiset</td>
-    <td>&lt;debug/hash_set&gt;</td>
+    <td>std::unordered_multiset</td>
+    <td>&lt;unordered_set&gt;</td>
+    <td>__gnu_debug::unordered_multiset</td>
+    <td>&lt;debug/unordered_set&gt;</td>
   </tr>
 </table>
 
@@ -308,10 +315,10 @@
   <li><code>std::multiset</code></li>
   <li><code>std::set</code></li>
   <li><code>std::vector</code></li>
-  <li><code>__gnu_cxx::hash_map</code></li>
-  <li><code>__gnu_cxx::hash_multimap</code></li>
-  <li><code>__gnu_cxx::hash_multiset</code></li>
-  <li><code>__gnu_cxx::hash_set</code></li>
+  <li><code>std::unordered_map</code></li>
+  <li><code>std::unordered_multimap</code></li>
+  <li><code>std::unordered_set</code></li>
+  <li><code>std::unordered_multiset</code></li>
 </ul>
 
 
diff --git a/libstdc++-v3/docs/html/ext/howto.html b/libstdc++-v3/docs/html/ext/howto.html
index 73881ed0296..cb544aa24c0 100644
--- a/libstdc++-v3/docs/html/ext/howto.html
+++ b/libstdc++-v3/docs/html/ext/howto.html
@@ -63,27 +63,28 @@
 <h2><a name="1">Ropes and trees and hashes, oh my!</a></h2>
    <p>The SGI headers</p>
    <pre>
-     &lt;bvector&gt;
      &lt;hash_map&gt;
      &lt;hash_set&gt;
      &lt;rope&gt;
      &lt;slist&gt;
-     &lt;tree&gt;
+     &lt;rb_tree&gt;
    </pre>
-   <p>are all here; <code>&lt;bvector&gt;</code> exposes the old bit_vector
-      class that was used before specialization of vector&lt;bool&gt; was
-      available (it's actually a typedef for the specialization now).
+   <p>are all here;
       <code>&lt;hash_map&gt;</code> and <code>&lt;hash_set&gt;</code>
-      are discussed further below.  <code>&lt;rope&gt;</code> is the SGI
-      specialization for large strings (&quot;rope,&quot; &quot;large
-      strings,&quot; get it?  love those SGI folks).
+      are deprecated but available as backwards-compatible extensions,
+      as discussed further below.  <code>&lt;rope&gt;</code> is the
+      SGI specialization for large strings (&quot;rope,&quot;
+      &quot;large strings,&quot; get it?  love those SGI folks).
       <code>&lt;slist&gt;</code> is a singly-linked list, for when the
-      doubly-linked <code>list&lt;&gt;</code> is too much space overhead, and
-      <code>&lt;tree&gt;</code> exposes the red-black tree classes used in the
-      implementation of the standard maps and sets.
+      doubly-linked <code>list&lt;&gt;</code> is too much space
+      overhead, and <code>&lt;rb_tree&gt;</code> exposes the red-black
+      tree classes used in the implementation of the standard maps and
+      sets.
    </p>
-   <p>Okay, about those hashing classes...  I'm going to foist most of the
-      work off onto SGI's own site.
+   <p>Okay, about those hashing classes... these classes have been
+   deprecated by the unordered_set, unordered_multiset, unordered_map,
+   unordered_multimap containers in TR1 and the upcoming C++0x, and
+   may be removed in future releases.
    </p>
    <p>Each of the associative containers map, multimap, set, and multiset
       have a counterpart which uses a
diff --git a/libstdc++-v3/docs/html/faq/index.html b/libstdc++-v3/docs/html/faq/index.html
index 298ae37cdb6..e38732e5833 100644
--- a/libstdc++-v3/docs/html/faq/index.html
+++ b/libstdc++-v3/docs/html/faq/index.html
@@ -927,7 +927,7 @@ http://clisp.cons.org/~haible/gccinclude-glibc-2.2-compat.diff
          <!-- Careful, the leading spaces in PRE show up directly. -->
       </p>
       <pre>
-      #include &lt;ext/hash_map&gt; </pre>
+      #include &lt;backward/hash_map&gt; </pre>
       <p>rather than using <code>-I</code> or other options.  This is more
          portable and forward-compatible.  (The situation is the same as
          that of other headers whose directories are not searched directly,
@@ -950,20 +950,20 @@ http://clisp.cons.org/~haible/gccinclude-glibc-2.2-compat.diff
       #ifdef __GNUC__
       #if __GNUC__ &lt; 3
         #include &lt;hash_map.h&gt;
-        namespace Sgi { using ::hash_map; }; // inherit globals
+        namespace extension { using ::hash_map; }; // inherit globals
       #else
-        #include &lt;ext/hash_map&gt;
+        #include &lt;backward/hash_map&gt;
         #if __GNUC_MINOR__ == 0
-          namespace Sgi = std;               // GCC 3.0
+          namespace extension = std;               // GCC 3.0
         #else
-          namespace Sgi = ::__gnu_cxx;       // GCC 3.1 and later
+          namespace extension = ::__gnu_cxx;       // GCC 3.1 and later
         #endif
       #endif
       #else      // ...  there are other compilers, right?
-        namespace Sgi = std;
+        namespace extension = std;
       #endif
 
-      Sgi::hash_map&lt;int,int&gt; my_map; </pre>
+      extension::hash_map&lt;int,int&gt; my_map; </pre>
       <p>This is a bit cleaner than defining typedefs for all the
          instantiations you might need.
       </p>