diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2014-06-26 13:43:59 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2014-06-26 13:43:59 +0100 |
| commit | 906314419f65152482646b66e38d1b3a0ace3762 (patch) | |
| tree | 5de924e025645a6f9286cad87cf142228f607a8b | |
| parent | 73c7d6bc25d9bb86bdb81283d237a5b94607ac8c (diff) | |
| download | gcc-906314419f65152482646b66e38d1b3a0ace3762.zip gcc-906314419f65152482646b66e38d1b3a0ace3762.tar.gz gcc-906314419f65152482646b66e38d1b3a0ace3762.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/shared_ptr_base.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 7b6c241..ba61134 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 590a8d3..6f85ffa 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()); |