]> git.ipfire.org Git - thirdparty/gcc.git/commit
PR libstdc++/91308 fix constraints on unique_ptr assignment
authorJonathan Wakely <jwakely@redhat.com>
Mon, 2 Sep 2019 11:10:04 +0000 (12:10 +0100)
committerJonathan Wakely <redi@gcc.gnu.org>
Mon, 2 Sep 2019 11:10:04 +0000 (12:10 +0100)
commit40358976bafcdcf85dd169f9da64412967f2760d
treefde658a7d8469c7056977360389b7296c2d5ac7f
parente78c5916125e96ec3ad27468b54fe7fa7cb65c50
PR libstdc++/91308 fix constraints on unique_ptr assignment

* testsuite/20_util/unique_ptr/assign/48635_neg.cc: Replace dg-error
with dg-prune-output for enable_if failure.
* testsuite/20_util/unique_ptr/cons/cv_qual_neg.cc: Add
dg-prune-output for enable_if failure.

Backport from mainline
2019-07-31  Jonathan Wakely  <jwakely@redhat.com>

PR libstdc++/91308
* include/bits/unique_ptr.h (unique_ptr::__safe_conversion_up): Remove
constraints on deleter that should only apply to the constructor.
(unique_ptr<T[], D>::__safe_conversion_up): Likewise.
(unique_ptr<T[], D>::unique_ptr(unique_ptr<U, D>&&)): Restore
constraints on deleter here.
* testsuite/20_util/unique_ptr/assign/91308.cc: New test.

From-SVN: r275311
libstdc++-v3/ChangeLog
libstdc++-v3/include/bits/unique_ptr.h
libstdc++-v3/testsuite/20_util/unique_ptr/assign/48635_neg.cc
libstdc++-v3/testsuite/20_util/unique_ptr/assign/91308.cc [new file with mode: 0644]
libstdc++-v3/testsuite/20_util/unique_ptr/cons/cv_qual_neg.cc