From 906314419f65152482646b66e38d1b3a0ace3762 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 26 Jun 2014 13:43:59 +0100
Subject: [PATCH] shared_ptr_base.h (__shared_ptr::_Deleter): Fix parameter
 type.

	* include/bits/shared_ptr_base.h (__shared_ptr::_Deleter): Fix
	parameter type.

From-SVN: r212027
---
 libstdc++-v3/ChangeLog                      | 5 +++++
 libstdc++-v3/include/bits/shared_ptr_base.h | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7b6c2413f00..ba61134f7bd 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-26  Jonathan Wakely  <jwakely@redhat.com>
+
+	* include/bits/shared_ptr_base.h (__shared_ptr::_Deleter): Fix
+	parameter type.
+
 2014-06-25  Jonathan Wakely  <jwakely@redhat.com>
 
 	* include/bits/alloc_traits.h (__alloc_rebind): Define alias template.
diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h
index 590a8d3cab7..6f85ffad955 100644
--- a/libstdc++-v3/include/bits/shared_ptr_base.h
+++ b/libstdc++-v3/include/bits/shared_ptr_base.h
@@ -1085,7 +1085,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       template<typename _Alloc>
         struct _Deleter
         {
-          void operator()(typename _Alloc::pointer __ptr)
+          void operator()(_Tp* __ptr)
           {
 	    __allocated_ptr<_Alloc> __guard{ _M_alloc, __ptr };
 	    allocator_traits<_Alloc>::destroy(_M_alloc, __guard.get());