diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2020-09-21 00:17:02 +0100 |
---|---|---|
committer | Jonathan Wakely <jwakely@redhat.com> | 2020-09-21 00:17:02 +0100 |
commit | 3c755b428e188228d0bad90625c995fd25a02322 (patch) | |
tree | d895c46205092971d1db22109e7e4af88e1056f9 | |
parent | 363e7755f227656684c8e284307ceee451503ca4 (diff) | |
download | gcc-3c755b428e188228d0bad90625c995fd25a02322.zip gcc-3c755b428e188228d0bad90625c995fd25a02322.tar.gz gcc-3c755b428e188228d0bad90625c995fd25a02322.tar.bz2 |
libstdc++: Fix noexcept-specifier for std::bind_front [PR 97101]
libstdc++-v3/ChangeLog:
PR libstdc++/97101
* include/std/functional (bind_front): Fix order of parameters
in is_nothrow_constructible_v specialization.
* testsuite/20_util/function_objects/bind_front/97101.cc: New test.
-rw-r--r-- | libstdc++-v3/include/std/functional | 4 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/20_util/function_objects/bind_front/97101.cc | 41 |
2 files changed, 43 insertions, 2 deletions
diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index 124bdad..407b93f 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -905,8 +905,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Fn, typename... _Args> constexpr _Bind_front_t<_Fn, _Args...> bind_front(_Fn&& __fn, _Args&&... __args) - noexcept(is_nothrow_constructible_v<int, _Bind_front_t<_Fn, _Args...>, - _Fn, _Args...>) + noexcept(is_nothrow_constructible_v<_Bind_front_t<_Fn, _Args...>, + int, _Fn, _Args...>) { return _Bind_front_t<_Fn, _Args...>(0, std::forward<_Fn>(__fn), std::forward<_Args>(__args)...); diff --git a/libstdc++-v3/testsuite/20_util/function_objects/bind_front/97101.cc b/libstdc++-v3/testsuite/20_util/function_objects/bind_front/97101.cc new file mode 100644 index 0000000..b159eb0 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/function_objects/bind_front/97101.cc @@ -0,0 +1,41 @@ +// Copyright (C) 2020 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-options "-std=gnu++2a" } +// { dg-do compile { target c++2a } } + +#include <functional> + +void +test01() +{ + struct F1 + { + void operator()() { } + }; + + struct F2 + { + F2() = default; + F2(const F2&) noexcept(false) { } + void operator()() { } + }; + + // PR libstdc++/97101 + static_assert( noexcept(std::bind_front(F1{})) ); + static_assert( ! noexcept(std::bind_front(F2{})) ); +} |