From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 07774384640F; Thu, 6 May 2021 12:42:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 07774384640F MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-566] libstdc++: Fix definition of std::remove_cvref_t X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 741155468610196bc9fa03cab92902d012b32654 X-Git-Newrev: 0e79e63026e43ad0577812ffb405dac8fa88af5b Message-Id: <20210506124212.07774384640F@sourceware.org> Date: Thu, 6 May 2021 12:42:12 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 May 2021 12:42:12 -0000 https://gcc.gnu.org/g:0e79e63026e43ad0577812ffb405dac8fa88af5b commit r12-566-g0e79e63026e43ad0577812ffb405dac8fa88af5b Author: Jonathan Wakely Date: Thu May 6 13:40:53 2021 +0100 libstdc++: Fix definition of std::remove_cvref_t I originally defined std::remove_cvref_t in terms of the internal __remove_cvref_t trait, to avoid instantiating the remove_cvref class template. However, as described in P1715R0 that is observable by users and is thus non-conforming. This defines remove_cvref_t as specified in the standard. libstdc++-v3/ChangeLog: * include/std/type_traits (remove_cvref_t): Define in terms of remove_cvref. * testsuite/20_util/remove_cvref/value.cc: Check alias. Diff: --- libstdc++-v3/include/std/type_traits | 17 +++++++++++++---- libstdc++-v3/testsuite/20_util/remove_cvref/value.cc | 7 +++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index 1f8b57b04a0..eaf06fcb036 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -3223,12 +3223,21 @@ template /// Remove references and cv-qualifiers. template struct remove_cvref - { - using type = __remove_cvref_t<_Tp>; - }; + : remove_cv<_Tp> + { }; + + template + struct remove_cvref<_Tp&> + : remove_cv<_Tp> + { }; + + template + struct remove_cvref<_Tp&&> + : remove_cv<_Tp> + { }; template - using remove_cvref_t = __remove_cvref_t<_Tp>; + using remove_cvref_t = typename remove_cvref<_Tp>::type; #define __cpp_lib_type_identity 201806L /// Identity metafunction. diff --git a/libstdc++-v3/testsuite/20_util/remove_cvref/value.cc b/libstdc++-v3/testsuite/20_util/remove_cvref/value.cc index d4a28422977..a4f50d433dc 100644 --- a/libstdc++-v3/testsuite/20_util/remove_cvref/value.cc +++ b/libstdc++-v3/testsuite/20_util/remove_cvref/value.cc @@ -48,3 +48,10 @@ void test01() static_assert(is_same::type, const int()>::value, ""); } + +// Declare using nested name of class template +template T func(typename std::remove_cvref::type); +// Define using alias +template T func(std::remove_cvref_t t) { return t; } +// Call must not be ambiguous +int i = func(1);