diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2012-04-26 02:20:32 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2012-04-26 02:20:32 +0000 |
| commit | af6204cc29a1a02f41a7a3f5d2b6a6b1dd098075 (patch) | |
| tree | 2670a66a8272e35467f0470ac6b1385c5794fda4 | |
| parent | 5ddecff9f260138d286332bb0114f3781d66c38a (diff) | |
| download | gcc-af6204cc29a1a02f41a7a3f5d2b6a6b1dd098075.zip gcc-af6204cc29a1a02f41a7a3f5d2b6a6b1dd098075.tar.gz gcc-af6204cc29a1a02f41a7a3f5d2b6a6b1dd098075.tar.bz2 | |
hashtable.h: Adjust doxygen markup for base classes.
2012-04-25 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/hashtable.h: Adjust doxygen markup for base classes.
* include/bits/hashtable_policy.h: Same.
From-SVN: r186856
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/hashtable.h | 10 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/hashtable_policy.h | 28 |
3 files changed, 30 insertions, 13 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4559311..269a545 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2012-04-25 Benjamin Kosnik <bkoz@redhat.com> + * include/bits/hashtable.h: Adjust doxygen markup for base classes. + * include/bits/hashtable_policy.h: Same. + +2012-04-25 Benjamin Kosnik <bkoz@redhat.com> + PR libstdc++/52689 * testsuite/17_intro/static.cc: Fix. * testsuite/lib/dg-options.exp (dg-require-static-libstdcxx): New. diff --git a/libstdc++-v3/include/bits/hashtable.h b/libstdc++-v3/include/bits/hashtable.h index 8c17035..5adc7ca 100644 --- a/libstdc++-v3/include/bits/hashtable.h +++ b/libstdc++-v3/include/bits/hashtable.h @@ -157,11 +157,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * explicitly passed, template pattern. * * Base class templates are: - * __detail::_Hashtable_base - * __detail::_Map_base - * __detail::_Insert - * __detail::_Rehash_base - * __detail::_Equality + * - __detail::_Hashtable_base + * - __detail::_Map_base + * - __detail::_Insert + * - __detail::_Rehash_base + * - __detail::_Equality */ template<typename _Key, typename _Value, typename _Alloc, typename _ExtractKey, typename _Equal, diff --git a/libstdc++-v3/include/bits/hashtable_policy.h b/libstdc++-v3/include/bits/hashtable_policy.h index 160a6ce..3b43510 100644 --- a/libstdc++-v3/include/bits/hashtable_policy.h +++ b/libstdc++-v3/include/bits/hashtable_policy.h @@ -121,10 +121,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * struct _Hash_node_base * - * Nodes, used to wrap elements stored in the hash table. A policy - * template parameter of class template _Hashtable controls whether - * nodes also store a hash code. In some cases (e.g. strings) this - * may be a performance win. + * Nodes, used to wrap elements stored in the hash table. A policy + * template parameter of class template _Hashtable controls whether + * nodes also store a hash code. In some cases (e.g. strings) this + * may be a performance win. */ struct _Hash_node_base { @@ -141,7 +141,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Value, bool _Cache_hash_code> struct _Hash_node; - /// Specialization. + /** + * Specialization for nodes with caches, struct _Hash_node. + * + * Base class is __detail::_Hash_node_base. + */ template<typename _Value> struct _Hash_node<_Value, true> : _Hash_node_base { @@ -156,7 +160,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_next() const { return static_cast<_Hash_node*>(_M_nxt); } }; - /// Specialization. + /** + * Specialization for nodes without caches, struct _Hash_node. + * + * Base class is __detail::_Hash_node_base. + */ template<typename _Value> struct _Hash_node<_Value, false> : _Hash_node_base { @@ -1421,8 +1429,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /** * Primary class template _Hashtable_base. * - * Base class for _Hashtable. Helper class adding management of - * _Equal functor to _Hash_code_base type. + * Helper class adding management of _Equal functor to + * _Hash_code_base type. + * + * Base class templates are: + * - __detail::_Hash_code_base + * - __detail::_Hashtable_ebo_helper */ template<typename _Key, typename _Value, typename _ExtractKey, typename _Equal, |