From 3e0c9334e9f766749d1661745b320860ae4827ef Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 13 Oct 2016 09:55:40 +0100 Subject: 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 --- libstdc++-v3/include/bits/invoke.h | 2 +- libstdc++-v3/include/std/functional | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'libstdc++-v3/include') 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 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 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)...); -- cgit v1.1