diff --git a/libstdc++-v3/include/bits/unique_ptr.h b/libstdc++-v3/include/bits/unique_ptr.h index 0f600db32f9..edcff78bff9 100644 --- a/libstdc++-v3/include/bits/unique_ptr.h +++ b/libstdc++-v3/include/bits/unique_ptr.h @@ -379,8 +379,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" /// Converting constructor from @c auto_ptr - template, is_same<_Dp, default_delete<_Tp>>>> + template, + is_same<_Dp, default_delete<_Tp>>>> unique_ptr(auto_ptr<_Up>&& __u) noexcept; #pragma GCC diagnostic pop #endif diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/creation/116529.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/creation/116529.cc new file mode 100644 index 00000000000..323fc7cb27c --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/unique_ptr/creation/116529.cc @@ -0,0 +1,35 @@ +// { dg-do run { target c++11 } } + +// Bug libstdc++/116529 - Construction of unique_ptr with reference type +// is rejected because of auto_ptr constructor + +#include +#include + +int count = 0; + +struct X +{ + ~X() { ++count; } +}; + +struct deleter : std::default_delete +{ + using pointer = X*; +}; + +void +test01() +{ + { + std::unique_ptr up(new X); + // { dg-bogus "forming pointer to reference" "" { target *-*-* } 0 } + VERIFY( count == 0 ); + } + VERIFY( count == 1 ); +} + +int main() +{ + test01(); +}