diff options
author | Jonathan Wakely <jwakely.gcc@gmail.com> | 2013-10-08 12:33:37 +0000 |
---|---|---|
committer | Jonathan Wakely <redi@gcc.gnu.org> | 2013-10-08 13:33:37 +0100 |
commit | 61bf02e007ceaaa81f92a9e10372303816955ba5 (patch) | |
tree | 9ae99d30df85db39801dab11898c312ec74fccfe /gcc | |
parent | 481d1b81534c70122187f38c26d6a19db587528f (diff) | |
download | gcc-61bf02e007ceaaa81f92a9e10372303816955ba5.zip gcc-61bf02e007ceaaa81f92a9e10372303816955ba5.tar.gz gcc-61bf02e007ceaaa81f92a9e10372303816955ba5.tar.bz2 |
re PR libstdc++/58659 (Construction of shared_ptr from unique_ptr mismatches new/delete and std::allocator for __shared_ptr_count)
PR libstdc++/58659
* include/bits/shared_ptr_base.h (__shared_count::__shared_count(P,D)):
Delegate to constructor taking allocator.
(__shared_count::_S_create_from_up): Inline into ...
(__shared_count::__shared_count(unique_ptr<Y,D>&&): Here. Use
std::conditional instead of constrained overloads. Allocate memory
using the allocator type that will be used for deallocation.
* testsuite/20_util/shared_ptr/cons/58659.cc: New.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Adjust.
From-SVN: r203274
Diffstat (limited to 'gcc')
0 files changed, 0 insertions, 0 deletions