From da8111a0248fd0b945177d345afbb2c6cbd75f3f Mon Sep 17 00:00:00 2001 From: Daniel Krugler Date: Sun, 17 Apr 2011 21:46:11 +0000 Subject: [PATCH] PR libstdc++/48635 (again) 2011-04-17 Daniel Krugler Paolo Carlini PR libstdc++/48635 (again) * include/bits/unique_ptr.h (unique_ptr<>::unique_ptr(unique_ptr<>&&), unique_ptr<_Tp[]>::unique_ptr(unique_ptr<>&&), unique_ptr<>::operator=(unique_ptr<>&&), unique_ptr<_Tp[]>::operator=(unique_ptr<>&&)): Use forward<_Ep>, not forward<_Dp>, to forward the deleter. * testsuite/20_util/unique_ptr/assign/48635_neg.cc: New. Co-Authored-By: Paolo Carlini From-SVN: r172619 --- libstdc++-v3/ChangeLog | 11 ++++ libstdc++-v3/include/bits/unique_ptr.h | 8 +-- .../20_util/unique_ptr/assign/48635_neg.cc | 50 +++++++++++++++++++ 3 files changed, 65 insertions(+), 4 deletions(-) create mode 100644 libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635_neg.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d8a2d217e9d..ab1ffcbec7d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,14 @@ +2011-04-17 Daniel Krugler + Paolo Carlini + + PR libstdc++/48635 (again) + * include/bits/unique_ptr.h (unique_ptr<>::unique_ptr(unique_ptr<>&&), + unique_ptr<_Tp[]>::unique_ptr(unique_ptr<>&&), + unique_ptr<>::operator=(unique_ptr<>&&), + unique_ptr<_Tp[]>::operator=(unique_ptr<>&&)): Use forward<_Ep>, not + forward<_Dp>, to forward the deleter. + * testsuite/20_util/unique_ptr/assign/48635_neg.cc: New. + 2011-04-15 Daniel Krugler Paolo Carlini diff --git a/libstdc++-v3/include/bits/unique_ptr.h b/libstdc++-v3/include/bits/unique_ptr.h index cf46d2a3a5f..e1f98b5f5c9 100644 --- a/libstdc++-v3/include/bits/unique_ptr.h +++ b/libstdc++-v3/include/bits/unique_ptr.h @@ -153,7 +153,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION && std::is_convertible<_Ep, _Dp>::value))> ::type> unique_ptr(unique_ptr<_Up, _Ep>&& __u) - : _M_t(__u.release(), std::forward(__u.get_deleter())) + : _M_t(__u.release(), std::forward<_Ep>(__u.get_deleter())) { } #if _GLIBCXX_USE_DEPRECATED @@ -186,7 +186,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION operator=(unique_ptr<_Up, _Ep>&& __u) { reset(__u.release()); - get_deleter() = std::forward(__u.get_deleter()); + get_deleter() = std::forward<_Ep>(__u.get_deleter()); return *this; } @@ -306,7 +306,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template unique_ptr(unique_ptr<_Up, _Ep>&& __u) - : _M_t(__u.release(), std::forward(__u.get_deleter())) + : _M_t(__u.release(), std::forward<_Ep>(__u.get_deleter())) { } // Destructor. @@ -326,7 +326,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION operator=(unique_ptr<_Up, _Ep>&& __u) { reset(__u.release()); - get_deleter() = std::forward(__u.get_deleter()); + get_deleter() = std::forward<_Ep>(__u.get_deleter()); return *this; } diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635_neg.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635_neg.cc new file mode 100644 index 00000000000..1ed53ee2d5c --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635_neg.cc @@ -0,0 +1,50 @@ +// { dg-options "-std=gnu++0x" } +// { dg-do compile } + +// Copyright (C) 2011 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 +// . + +#include + +struct D; + +struct B +{ + B& operator=(D&) = delete; // { dg-error "declared here" } + + template + void operator()(T*) const {} +}; + +struct D : B { }; + +// libstdc++/48635 +void f() +{ + B b; + D d; + + std::unique_ptr ub(nullptr, b); + std::unique_ptr ud(nullptr, d); + ub = std::move(ud); +// { dg-error "use of deleted function" "" { target *-*-* } 189 } + + std::unique_ptr uba(nullptr, b); + std::unique_ptr uda(nullptr, d); + uba = std::move(uda); +// { dg-error "use of deleted function" "" { target *-*-* } 329 } +} -- 2.30.2