From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 26 Jun 2014 12:43:59 +0000 (+0100)
Subject: shared_ptr_base.h (__shared_ptr::_Deleter): Fix parameter type.
X-Git-Tag: releases/gcc-5.1.0~6641
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=906314419f65152482646b66e38d1b3a0ace3762;p=thirdparty%2Fgcc.git

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
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7b6c2413f00f..ba61134f7bde 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 590a8d3cab7d..6f85ffad955e 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());