diff options
Diffstat (limited to 'libstdc++-v3/docs')
| -rw-r--r-- | libstdc++-v3/docs/doxygen/Intro.3 | 11 | ||||
| -rw-r--r-- | libstdc++-v3/docs/doxygen/user.cfg.in | 6 | ||||
| -rw-r--r-- | libstdc++-v3/docs/html/debug.html | 47 | ||||
| -rw-r--r-- | libstdc++-v3/docs/html/ext/howto.html | 27 | ||||
| -rw-r--r-- | libstdc++-v3/docs/html/faq/index.html | 14 |
5 files changed, 51 insertions, 54 deletions
diff --git a/libstdc++-v3/docs/doxygen/Intro.3 b/libstdc++-v3/docs/doxygen/Intro.3 index 48cb31f87f1..cb3ff2e4a1e 100644 --- a/libstdc++-v3/docs/doxygen/Intro.3 +++ b/libstdc++-v3/docs/doxygen/Intro.3 @@ -77,15 +77,7 @@ read FAQ 5.4 and use a prefix. .TS lB lB lB lB. -<algo.h> <hash_map.h> <map.h> <slist.h> -<algobase.h> <hash_set.h> <multimap.h> <stack.h> -<alloc.h> <hashtable.h> <multiset.h> <stream.h> -<bvector.h> <heap.h> <new.h> <streambuf.h> -<complex.h> <iomanip.h> <ostream.h> <strstream> -<defalloc.h> <iostream.h> <pair.h> <strstream.h> -<deque.h> <istream.h> <queue.h> <tempbuf.h> -<fstream.h> <iterator.h> <rope.h> <tree.h> -<function.h> <list.h> <set.h> <vector.h> +<strstream> .TE .SS Extension Headers These headers will only be found automatically if you include the leading @@ -98,7 +90,6 @@ lB lB. <ext/algorithm> <ext/numeric> <ext/functional> <ext/iterator> <ext/slist> <ext/rb_tree> -<ext/hash_map> <ext/hash_set> <ext/rope> <ext/memory> <ext/bitmap_allocator.h> <ext/debug_allocator.h> <ext/malloc_allocator.h> <ext/mt_allocator.h> diff --git a/libstdc++-v3/docs/doxygen/user.cfg.in b/libstdc++-v3/docs/doxygen/user.cfg.in index 6b8cca1c871..20a041e0f99 100644 --- a/libstdc++-v3/docs/doxygen/user.cfg.in +++ b/libstdc++-v3/docs/doxygen/user.cfg.in @@ -542,10 +542,10 @@ INPUT = @srcdir@/docs/doxygen/doxygroups.cc \ include/utility \ include/valarray \ include/vector \ + include/backward/hash_map \ + include/backward/hash_set \ include/debug/bitset \ include/debug/deque \ - include/debug/hash_map \ - include/debug/hash_set \ include/debug/list \ include/debug/map \ include/debug/set \ @@ -553,8 +553,6 @@ INPUT = @srcdir@/docs/doxygen/doxygroups.cc \ include/debug/vector \ include/ext/algorithm \ include/ext/functional \ - include/ext/hash_map \ - include/ext/hash_set \ include/ext/iterator \ include/ext/memory \ include/ext/numeric \ 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><debug/vector></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><ext/hash_map></td> - <td>__gnu_debug::hash_map</td> - <td><debug/hash_map></td> + <td>std::unordered_map</td> + <td><unordered_map></td> + <td>__gnu_debug::unordered_map</td> + <td><debug/unordered_map></td> </tr> <tr> - <td>__gnu_cxx::hash_multimap</td> - <td><ext/hash_map></td> - <td>__gnu_debug::hash_multimap</td> - <td><debug/hash_map></td> + <td>std::unordered_multimap</td> + <td><unordered_map></td> + <td>__gnu_debug::unordered_multimap</td> + <td><debug/unordered_map></td> </tr> <tr> - <td>__gnu_cxx::hash_set</td> - <td><ext/hash_set></td> - <td>__gnu_debug::hash_set</td> - <td><debug/hash_set></td> + <td>std::unordered_set</td> + <td><unordered_set></td> + <td>__gnu_debug::unordered_set</td> + <td><debug/unordered_set></td> </tr> <tr> - <td>__gnu_cxx::hash_multiset</td> - <td><ext/hash_set></td> - <td>__gnu_debug::hash_multiset</td> - <td><debug/hash_set></td> + <td>std::unordered_multiset</td> + <td><unordered_set></td> + <td>__gnu_debug::unordered_multiset</td> + <td><debug/unordered_set></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> - <bvector> <hash_map> <hash_set> <rope> <slist> - <tree> + <rb_tree> </pre> - <p>are all here; <code><bvector></code> exposes the old bit_vector - class that was used before specialization of vector<bool> was - available (it's actually a typedef for the specialization now). + <p>are all here; <code><hash_map></code> and <code><hash_set></code> - are discussed further below. <code><rope></code> is the SGI - specialization for large strings ("rope," "large - strings," get it? love those SGI folks). + are deprecated but available as backwards-compatible extensions, + as discussed further below. <code><rope></code> is the + SGI specialization for large strings ("rope," + "large strings," get it? love those SGI folks). <code><slist></code> is a singly-linked list, for when the - doubly-linked <code>list<></code> is too much space overhead, and - <code><tree></code> exposes the red-black tree classes used in the - implementation of the standard maps and sets. + doubly-linked <code>list<></code> is too much space + overhead, and <code><rb_tree></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 <ext/hash_map> </pre> + #include <backward/hash_map> </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__ < 3 #include <hash_map.h> - namespace Sgi { using ::hash_map; }; // inherit globals + namespace extension { using ::hash_map; }; // inherit globals #else - #include <ext/hash_map> + #include <backward/hash_map> #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<int,int> my_map; </pre> + extension::hash_map<int,int> my_map; </pre> <p>This is a bit cleaner than defining typedefs for all the instantiations you might need. </p> |
