procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libstdc++/58594 (std::make_shared does not accept const types as parameters)

Browse source 
PR libstdc++/58594
	* include/bits/shared_ptr_base.h: Cast away cv-quals.
	* testsuite/20_util/shared_ptr/creation/58594-no-rtti.cc: New.
	* testsuite/20_util/shared_ptr/creation/private.cc: Make allocator
	rebindable so test passes with -fno-rtti.

From-SVN: r218691
This commit is contained in:
Jonathan Wakely 2014-12-12 21:05:35 +00:00 • committed by Jonathan Wakely
parent 4573e50a83
commit d95521b411
4 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View file

@ -32,6 +32,12 @@
* libsupc++/vterminate.cc: Likewise.
* src/c++11/thread.cc: Likewise.
PR libstdc++/58594
* include/bits/shared_ptr_base.h: Cast away cv-quals.
* testsuite/20_util/shared_ptr/creation/58594-no-rtti.cc: New.
* testsuite/20_util/shared_ptr/creation/private.cc: Make allocator
rebindable so test passes with -fno-rtti.
2014-12-12 Jonathan Wakely <jwakely@redhat.com>
* include/bits/stl_iterator.h (make_reverse_iterator): LWG DR 2285.

2
libstdc++-v3/include/bits/shared_ptr_base.h
View file

@ -1120,7 +1120,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
: _M_ptr(), _M_refcount()
{
typedef typename allocator_traits<_Alloc>::template
rebind_traits<_Tp> __traits;
rebind_traits<typename std::remove_cv<_Tp>::type> __traits;
_Deleter<typename __traits::allocator_type> __del = { __a };
auto __guard = std::__allocate_guarded(__del._M_alloc);
_M_ptr = __guard.get();

27
libstdc++-v3/testsuite/20_util/shared_ptr/creation/58594-no-rtti.cc Normal file
View file

@ -0,0 +1,27 @@
// { dg-options "-std=gnu++11 -fno-rtti" }
// { dg-do compile }
// Copyright (C) 2014 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>();
}

12
libstdc++-v3/testsuite/20_util/shared_ptr/creation/private.cc
View file

@ -37,8 +37,17 @@ public:
};
template<typename T>
struct MyAlloc : std::allocator<Private>
struct MyAlloc : std::allocator<T>
{
template<typename U>
struct rebind { typedef MyAlloc<U> other; };
MyAlloc() = default;
MyAlloc(const MyAlloc&) = default;
template<typename U>
MyAlloc(const MyAlloc<U>&) { }
void construct(T* p) { ::new((void*)p) T(); }
void destroy(T* p) { p->~T(); }
};
@ -49,4 +58,3 @@ int main()
auto p = std::allocate_shared<Private>(a);
return p->get();
}