diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index fc798faa5a6..a3f9b43ccbe 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2017-01-17 Jonathan Wakely + + 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 PR other/79046 diff --git a/libstdc++-v3/libsupc++/nested_exception.h b/libstdc++-v3/libsupc++/nested_exception.h index 35b025afd84..43970b4ef86 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_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 00000000000..8afc72bcbef --- /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 +// . + +// { dg-do compile { target c++11 } } + +#include + +void +test01() +{ + std::throw_with_nested(""); + std::throw_with_nested(test01); +}