From: Jonathan Wakely <jwakely@redhat.com>
Date: Sat, 12 Nov 2016 03:24:34 +0000 (+0000)
Subject: Use shared_ptr<T>::element_type in hash specializations
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0f88f1f2ab86b2e0f07996d4d1ab10a225264377;p=gcc.git

Use shared_ptr<T>::element_type in hash specializations

	* include/bits/shared_ptr.h (hash<shared_ptr<T>>): Use element_type.
	* include/bits/shared_ptr_base.h (hash<__shared_ptr<T, L>>): Likewise.

From-SVN: r242333
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e1a4764afd7..f8eb55db79f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-11  Jonathan Wakely  <jwakely@redhat.com>
+
+	* include/bits/shared_ptr.h (hash<shared_ptr<T>>): Use element_type.
+	* include/bits/shared_ptr_base.h (hash<__shared_ptr<T, L>>): Likewise.
+
 2016-11-10  François Dumont  <fdumont@gcc.gnu.org>
 
 	* src/c++11/debug.cc (format_word): Delete.
diff --git a/libstdc++-v3/include/bits/shared_ptr.h b/libstdc++-v3/include/bits/shared_ptr.h
index 9f7a40c5e1e..e562a42b339 100644
--- a/libstdc++-v3/include/bits/shared_ptr.h
+++ b/libstdc++-v3/include/bits/shared_ptr.h
@@ -692,7 +692,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     {
       size_t
       operator()(const shared_ptr<_Tp>& __s) const noexcept
-      { return std::hash<_Tp*>()(__s.get()); }
+      {
+	return std::hash<typename shared_ptr<_Tp>::element_type*>()(__s.get());
+      }
     };
 
   // @} group pointer_abstractions
diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h
index 1a9e3e901e9..5e344b8e090 100644
--- a/libstdc++-v3/include/bits/shared_ptr_base.h
+++ b/libstdc++-v3/include/bits/shared_ptr_base.h
@@ -1681,7 +1681,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     {
       size_t
       operator()(const __shared_ptr<_Tp, _Lp>& __s) const noexcept
-      { return std::hash<_Tp*>()(__s.get()); }
+      {
+	return hash<typename __shared_ptr<_Tp, _Lp>::element_type*>()(
+	    __s.get());
+      }
     };
 
 _GLIBCXX_END_NAMESPACE_VERSION