2012-04-11 Jonathan Wakely <jwakely.gcc@gmail.com>
+ PR libstdc++/52924
+ * include/bits/shared_ptr_base.h (_Sp_counted_deleter): Add
+ user-defined destructor.
+ (_Sp_counted_inplace): Likewise.
+ * testsuite/20_util/shared_ptr/cons/52924.cc: New.
+ * testsuite/20_util/shared_ptr/cons/43820_neg.cc: Adjust dg-error
+ line numbers.
+
+2012-04-11 Jonathan Wakely <jwakely.gcc@gmail.com>
+
* testsuite/performance/30_threads/future/polling.cc: Adjust.
2012-04-11 Jonathan Wakely <jwakely.gcc@gmail.com>
_Sp_counted_deleter(_Ptr __p, _Deleter __d, const _Alloc& __a)
: _M_ptr(__p), _M_del(__d, __a) { }
+ ~_Sp_counted_deleter() noexcept { }
+
virtual void
_M_dispose() noexcept
{ _M_del._M_del(_M_ptr); }
std::forward<_Args>(__args)...); // might throw
}
+ ~_Sp_counted_ptr_inplace() noexcept { }
+
virtual void
_M_dispose() noexcept
{ allocator_traits<_Alloc>::destroy(_M_impl, _M_impl._M_ptr); }
{
X* px = 0;
std::shared_ptr<X> p1(px); // { dg-error "here" }
- // { dg-error "incomplete" "" { target *-*-* } 771 }
+ // { dg-error "incomplete" "" { target *-*-* } 775 }
std::shared_ptr<X> p9(ap()); // { dg-error "here" }
- // { dg-error "incomplete" "" { target *-*-* } 865 }
+ // { dg-error "incomplete" "" { target *-*-* } 869 }
}
--- /dev/null
+// { dg-options "-std=gnu++0x" }
+// { dg-do compile }
+
+// Copyright (C) 2012 Free Software Foundation
+//
+// 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++/52924
+
+struct A { } a;
+
+struct D {
+ ~D() noexcept(false) { }
+ void operator()(A*) { }
+} d;
+
+auto sp = std::shared_ptr<A>(&a, d);
+
+template<typename T>
+struct Alloc : std::allocator<T>
+{
+ Alloc() = default;
+ ~Alloc() noexcept(false) { }
+ template<typename U> Alloc(const Alloc<U>&) { }
+};
+
+Alloc<A> al;
+
+auto as = std::allocate_shared<A>(al);