diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2016-10-13 09:55:40 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2016-10-13 09:55:40 +0100 |
| commit | 3e0c9334e9f766749d1661745b320860ae4827ef (patch) | |
| tree | de65450242299903cce5c67fcf15cc1599d140d7 /libstdc++-v3 | |
| parent | 92c5266bbd5378a5513f43edf23b1394621675a3 (diff) | |
| download | gcc-3e0c9334e9f766749d1661745b320860ae4827ef.zip gcc-3e0c9334e9f766749d1661745b320860ae4827ef.tar.gz gcc-3e0c9334e9f766749d1661745b320860ae4827ef.tar.bz2 | |
Fix exception-specification of std::invoke
* include/bits/invoke.h (__invoke): Fix exception-specification.
* include/std/functional (invoke): Likewise.
* testsuite/20_util/function_objects/invoke/1.cc: New test.
From-SVN: r241089
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/invoke.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/functional | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/function_objects/invoke/1.cc | 30 |
4 files changed, 38 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 81ea0e5..5ee2626 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2016-10-13 Jonathan Wakely <jwakely@redhat.com> + + * include/bits/invoke.h (__invoke): Fix exception-specification. + * include/std/functional (invoke): Likewise. + * testsuite/20_util/function_objects/invoke/1.cc: New test. + 2016-10-12 Paolo Carlini <paolo.carlini@oracle.com> * testsuite/util/testsuite_hooks.h: Rewrite VERIFY in terms of diff --git a/libstdc++-v3/include/bits/invoke.h b/libstdc++-v3/include/bits/invoke.h index 60405b5..2bbdab7 100644 --- a/libstdc++-v3/include/bits/invoke.h +++ b/libstdc++-v3/include/bits/invoke.h @@ -87,7 +87,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Callable, typename... _Args> constexpr typename result_of<_Callable&&(_Args&&...)>::type __invoke(_Callable&& __fn, _Args&&... __args) - noexcept(__is_nothrow_callable<_Callable(_Args&&...)>::value) + noexcept(__is_nothrow_callable<_Callable&&(_Args&&...)>::value) { using __result_of = result_of<_Callable&&(_Args&&...)>; using __type = typename __result_of::type; diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index 2587392..6a45314 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -200,7 +200,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Callable, typename... _Args> inline result_of_t<_Callable&&(_Args&&...)> invoke(_Callable&& __fn, _Args&&... __args) - noexcept(is_nothrow_callable_v<_Callable(_Args&&...)>) + noexcept(is_nothrow_callable_v<_Callable&&(_Args&&...)>) { return std::__invoke(std::forward<_Callable>(__fn), std::forward<_Args>(__args)...); diff --git a/libstdc++-v3/testsuite/20_util/function_objects/invoke/1.cc b/libstdc++-v3/testsuite/20_util/function_objects/invoke/1.cc new file mode 100644 index 0000000..81bf25a --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/function_objects/invoke/1.cc @@ -0,0 +1,30 @@ +// Copyright (C) 2016 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 <functional> + +struct abstract { + virtual ~abstract() = 0; + void operator()() noexcept; +}; + +static_assert( noexcept(std::__invoke(std::declval<abstract>())), "" ); +#if __cpp_lib_invoke +static_assert( noexcept(std::invoke(std::declval<abstract>())), "" ); +#endif |