From 83faf7eacd2081a373afb6069fd923c2dc497271 Mon Sep 17 00:00:00 2001 From: Patrick Palka Date: Fri, 18 Jun 2021 11:51:33 -0400 Subject: [PATCH] libstdc++: Implement LWG 3557 change to convertible_to libstdc++-v3/ChangeLog: * include/std/concepts (convertible_to): Just use declval as per LWG 3557. --- libstdc++-v3/include/std/concepts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libstdc++-v3/include/std/concepts b/libstdc++-v3/include/std/concepts index 4490f53..7f5421f 100644 --- a/libstdc++-v3/include/std/concepts +++ b/libstdc++-v3/include/std/concepts @@ -70,9 +70,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// [concept.convertible], concept convertible_to template concept convertible_to = is_convertible_v<_From, _To> - && requires(add_rvalue_reference_t<_From> (&__f)()) { - static_cast<_To>(__f()); - }; + && requires { static_cast<_To>(std::declval<_From>()); }; /// [concept.commonref], concept common_reference_with template -- 2.7.4