From 9992d564293ad265be00ffad5fc96908075acbde Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 18 Jul 2011 16:07:24 +0000 Subject: [PATCH] re PR libstdc++/48430 (std::hash partial specialization for std::unique_ptr and std::shared_ptr are using unary_function) 2011-07-18 Paolo Carlini PR libstdc++/48430 * include/bits/shared_ptr.h (struct hash>): Use __hash_base. * include/bits/unique_ptr.h (struct hash>): Likewise. From-SVN: r176405 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/include/bits/shared_ptr.h | 2 +- libstdc++-v3/include/bits/unique_ptr.h | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 990fce997ce..5227dc02b31 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2011-07-18 Paolo Carlini + + PR libstdc++/48430 + * include/bits/shared_ptr.h (struct hash>): Use + __hash_base. + * include/bits/unique_ptr.h (struct hash>): Likewise. + 2011-07-18 Rainer Orth * crossconfig.m4 (*-netware): Remove. diff --git a/libstdc++-v3/include/bits/shared_ptr.h b/libstdc++-v3/include/bits/shared_ptr.h index 2158de6bf81..2c45f3d7ba3 100644 --- a/libstdc++-v3/include/bits/shared_ptr.h +++ b/libstdc++-v3/include/bits/shared_ptr.h @@ -614,7 +614,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// std::hash specialization for shared_ptr. template struct hash> - : public std::unary_function, size_t> + : public __hash_base> { size_t operator()(const shared_ptr<_Tp>& __s) const diff --git a/libstdc++-v3/include/bits/unique_ptr.h b/libstdc++-v3/include/bits/unique_ptr.h index a6f457ee59e..869d931330c 100644 --- a/libstdc++-v3/include/bits/unique_ptr.h +++ b/libstdc++-v3/include/bits/unique_ptr.h @@ -542,7 +542,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// std::hash specialization for unique_ptr. template struct hash> - : public std::unary_function, size_t> + : public __hash_base> { size_t operator()(const unique_ptr<_Tp, _Dp>& __u) const -- 2.30.2