diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2012-05-15 10:00:19 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo.carlini@oracle.com> | 2012-05-15 10:00:19 +0000 |
| commit | 8fb4beff66f7b271c6ac25cd5d3c164dae144b1a (patch) | |
| tree | 9983ba44c7753e2b84264a4b942386269047c4cb /libstdc++-v3/include/ext | |
| parent | 430e71849db2f9344cf216157e8ab22ce335a852 (diff) | |
2012-05-15 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/53339
* include/bits/hashtable_policy.h (__detail::_Identity,
__detail::_Select1st): Add.
(_Map_base, _Hashtable_base): Use the latter, adjust parameters.
* include/bits/hashtable.h (_Hashtable::__key_extract): Adjust.
* include/bits/unordered_set.h (__uset_hashtable, __umset_hashtable):
Likewise.
* include/bits/unordered_map.h (__umap_hashtable, __ummap_hashtable):
Likewise.
* include/bits/stl_function.h (_Identity, _Select1st, _Select2nd)
Unconditionally derive from unary_function.
* include/ext/functional (identity, select1st, select2nd): Remove
#ifdef __GXX_EXPERIMENTAL_CXX0X__ bits.
* testsuite/23_containers/unordered_map/requirements/53339.cc: New.
* testsuite/23_containers/unordered_multimap/requirements/
53339.cc: Likewise.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@187515 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/ext')
| -rw-r--r-- | libstdc++-v3/include/ext/functional | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/libstdc++-v3/include/ext/functional b/libstdc++-v3/include/ext/functional index f8402c16dc6..c981da0cb71 100644 --- a/libstdc++-v3/include/ext/functional +++ b/libstdc++-v3/include/ext/functional @@ -184,12 +184,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION */ template <class _Tp> struct identity -#ifdef __GXX_EXPERIMENTAL_CXX0X__ - : public std::unary_function<_Tp,_Tp>, - public std::_Identity<_Tp> {}; -#else : public std::_Identity<_Tp> {}; -#endif /** @c select1st and @c select2nd are extensions provided by SGI. Their * @c operator()s @@ -204,22 +199,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// An \link SGIextensions SGI extension \endlink. template <class _Pair> struct select1st -#ifdef __GXX_EXPERIMENTAL_CXX0X__ - : public std::unary_function<_Pair, typename _Pair::first_type>, - public std::_Select1st<_Pair> {}; -#else : public std::_Select1st<_Pair> {}; -#endif /// An \link SGIextensions SGI extension \endlink. template <class _Pair> struct select2nd -#ifdef __GXX_EXPERIMENTAL_CXX0X__ - : public std::unary_function<_Pair, typename _Pair::second_type>, - public std::_Select2nd<_Pair> {}; -#else : public std::_Select2nd<_Pair> {}; -#endif + /** @} */ // extension documented next |