PR libstdc++/83395 fix invocable traits for INVOKE<cv void>
PR libstdc++/83395 * include/std/type_traits (__is_invocable_impl): Remove partial specialization for INVOKE<void> and restore is_void<R> check in primary template. (__is_nt_invocable_impl): Likewise. * testsuite/20_util/is_invocable/83395.cc: New test. * testsuite/20_util/is_nothrow_invocable/83395.cc: New test. From-SVN: r255585
This commit is contained in:
parent
d712665521
commit
4fb43923ef
|
@ -1,3 +1,13 @@
|
|||
2017-12-12 Jonathan Wakely <jwakely@redhat.com>
|
||||
|
||||
PR libstdc++/83395
|
||||
* include/std/type_traits (__is_invocable_impl): Remove partial
|
||||
specialization for INVOKE<void> and restore is_void<R> check in
|
||||
primary template.
|
||||
(__is_nt_invocable_impl): Likewise.
|
||||
* testsuite/20_util/is_invocable/83395.cc: New test.
|
||||
* testsuite/20_util/is_nothrow_invocable/83395.cc: New test.
|
||||
|
||||
2017-12-01 Jonathan Wakely <jwakely@redhat.com>
|
||||
|
||||
Backport from mainline
|
||||
|
|
|
@ -2755,12 +2755,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
|
||||
template<typename _Result, typename _Ret>
|
||||
struct __is_invocable_impl<_Result, _Ret, __void_t<typename _Result::type>>
|
||||
: is_convertible<typename _Result::type, _Ret>::type
|
||||
{ };
|
||||
|
||||
template<typename _Result>
|
||||
struct __is_invocable_impl<_Result, void, __void_t<typename _Result::type>>
|
||||
: true_type
|
||||
: __or_<is_void<_Ret>, is_convertible<typename _Result::type, _Ret>>::type
|
||||
{ };
|
||||
|
||||
template<typename _Fn, typename... _ArgTypes>
|
||||
|
@ -2865,14 +2860,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
template<typename _Result, typename _Ret>
|
||||
struct __is_nt_invocable_impl<_Result, _Ret,
|
||||
__void_t<typename _Result::type>>
|
||||
: __and_<is_convertible<typename _Result::type, _Ret>,
|
||||
is_nothrow_constructible<_Ret, typename _Result::type>>
|
||||
{ };
|
||||
|
||||
template<typename _Result>
|
||||
struct __is_nt_invocable_impl<_Result, void,
|
||||
__void_t<typename _Result::type>>
|
||||
: true_type
|
||||
: __or_<is_void<_Ret>,
|
||||
__and_<is_convertible<typename _Result::type, _Ret>,
|
||||
is_nothrow_constructible<_Ret, typename _Result::type>>>
|
||||
{ };
|
||||
|
||||
/// std::is_nothrow_invocable_r
|
||||
|
|
|
@ -0,0 +1,28 @@
|
|||
// 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-options "-std=gnu++17" }
|
||||
// { dg-do compile { target c++1z } }
|
||||
|
||||
#include <type_traits>
|
||||
|
||||
// PR libstdc++/83395
|
||||
using F = int(*)();
|
||||
static_assert(std::is_invocable_r<void, F>::value);
|
||||
static_assert(std::is_invocable_r<void const, F>::value);
|
||||
static_assert(std::is_invocable_r<void volatile, F>::value);
|
||||
static_assert(std::is_invocable_r<void const volatile, F>::value);
|
|
@ -0,0 +1,28 @@
|
|||
// 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-options "-std=gnu++17" }
|
||||
// { dg-do compile { target c++1z } }
|
||||
|
||||
#include <type_traits>
|
||||
|
||||
// PR libstdc++/83395
|
||||
using F = int(*)() noexcept;
|
||||
static_assert(std::is_nothrow_invocable_r<void, F>::value);
|
||||
static_assert(std::is_nothrow_invocable_r<void const, F>::value);
|
||||
static_assert(std::is_nothrow_invocable_r<void volatile, F>::value);
|
||||
static_assert(std::is_nothrow_invocable_r<void const volatile, F>::value);
|
Loading…
Reference in New Issue