diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-10-02 19:55:14 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-10-02 19:55:14 +0000 |
| commit | f6dd9c9d6b9fa8ce08da1864d09991b1a841b540 (patch) | |
| tree | da158cd3e611e74a0e7df18b51dc0da8d00d73c3 /libstdc++-v3/include/bits/shared_ptr_base.h | |
| parent | 440fc67c635ecf3cbcfb970a6530a5ba971c0730 (diff) | |
| download | ppe42-gcc-f6dd9c9d6b9fa8ce08da1864d09991b1a841b540.tar.gz ppe42-gcc-f6dd9c9d6b9fa8ce08da1864d09991b1a841b540.zip | |
PR libstdc++/58594
* include/bits/shared_ptr_base.h
(_Sp_counted_ptr_inplace::_M_get_deleter()): Cast away cv-quals.
* testsuite/20_util/shared_ptr/creation/58594.cc: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@203131 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits/shared_ptr_base.h')
| -rw-r--r-- | libstdc++-v3/include/bits/shared_ptr_base.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h index fb19d0887dc..f4bff77eabe 100644 --- a/libstdc++-v3/include/bits/shared_ptr_base.h +++ b/libstdc++-v3/include/bits/shared_ptr_base.h @@ -459,10 +459,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_get_deleter(const std::type_info& __ti) noexcept { #ifdef __GXX_RTTI - return __ti == typeid(_Sp_make_shared_tag) ? _M_ptr() : nullptr; -#else - return nullptr; + if (__ti == typeid(_Sp_make_shared_tag)) + return const_cast<typename remove_cv<_Tp>::type*>(_M_ptr()); #endif + return nullptr; } private: |
