[Bug libstdc++/58659] Construction of shared_ptr from unique_ptr mismatches new/delete and std::allocator for __shared_ptr_count

[redi at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58659

--- Comment #3 from Jonathan Wakely <redi at gcc dot gnu.org> ---
Author: redi
Date: Tue Oct  8 13:38:21 2013
New Revision: 203277

URL: http://gcc.gnu.org/viewcvs?rev=203277&root=gcc&view=rev
Log:
    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.

Added:
   
branches/gcc-4_8-branch/libstdc++-v3/testsuite/20_util/shared_ptr/cons/58659.cc
Modified:
    branches/gcc-4_8-branch/libstdc++-v3/ChangeLog
    branches/gcc-4_8-branch/libstdc++-v3/include/bits/shared_ptr_base.h
   
branches/gcc-4_8-branch/libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820_neg.cc