diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2017-01-17 15:26:06 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2017-01-17 15:26:06 +0000 |
| commit | 04c872aae4a834dd60cef275d66bd7a3503f8128 (patch) | |
| tree | 55e4817822b8788a3eb0f316e0d4e359938ac8a7 /libstdc++-v3 | |
| parent | 4f197ff9a82986bea40e6075c55b45348e4495ef (diff) | |
| download | gcc-04c872aae4a834dd60cef275d66bd7a3503f8128.zip gcc-04c872aae4a834dd60cef275d66bd7a3503f8128.tar.gz gcc-04c872aae4a834dd60cef275d66bd7a3503f8128.tar.bz2 | |
PR79114 use decayed type in std::throw_with_nested assertion
PR libstdc++/79114
* libsupc++/nested_exception.h (throw_with_nested): Use decay instead
of remove_reference.
* testsuite/18_support/nested_exception/79114.cc: New test.
From-SVN: r244531
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/nested_exception.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/18_support/nested_exception/79114.cc | 27 |
3 files changed, 35 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index fc798fa..a3f9b43 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2017-01-17 Jonathan Wakely <jwakely@redhat.com> + + PR libstdc++/79114 + * libsupc++/nested_exception.h (throw_with_nested): Use decay instead + of remove_reference. + * testsuite/18_support/nested_exception/79114.cc: New test. + 2017-01-17 Jakub Jelinek <jakub@redhat.com> PR other/79046 diff --git a/libstdc++-v3/libsupc++/nested_exception.h b/libstdc++-v3/libsupc++/nested_exception.h index 35b025a..43970b4 100644 --- a/libstdc++-v3/libsupc++/nested_exception.h +++ b/libstdc++-v3/libsupc++/nested_exception.h @@ -111,7 +111,7 @@ namespace std inline void throw_with_nested(_Tp&& __t) { - using _Up = typename remove_reference<_Tp>::type; + using _Up = typename decay<_Tp>::type; using _CopyConstructible = __and_<is_copy_constructible<_Up>, is_move_constructible<_Up>>; static_assert(_CopyConstructible::value, diff --git a/libstdc++-v3/testsuite/18_support/nested_exception/79114.cc b/libstdc++-v3/testsuite/18_support/nested_exception/79114.cc new file mode 100644 index 0000000..8afc72b --- /dev/null +++ b/libstdc++-v3/testsuite/18_support/nested_exception/79114.cc @@ -0,0 +1,27 @@ +// Copyright (C) 2017 Free Software Foundation, Inc. +// +// 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/>. + +// { dg-do compile { target c++11 } } + +#include <exception> + +void +test01() +{ + std::throw_with_nested(""); + std::throw_with_nested(test01); +} |