@@ -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:
new file mode 100644
@@ -0,0 +1,27 @@
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+// Copyright (C) 2013 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <memory>
+
+// libstdc++/58594
+void test01()
+{
+ std::make_shared<const int>();
+}
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. Tested x86_64-linux, committed to trunk commit a58a4bea9475af3e3c44959aeab4b3ac48dc1af0 Author: Jonathan Wakely <jwakely.gcc@gmail.com> Date: Wed Oct 2 19:34:01 2013 +0100 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.