From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id E56EE385828B; Wed, 6 Dec 2023 21:01:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E56EE385828B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1701896475; bh=pehJp1rP9Uxppb7ZE4F4Kj3PKLJSzguLJi6tSACLcdU=; h=From:To:Subject:Date:From; b=haU0ii/VYk/LyiNX1/FQHLWtOles+khioXd0EhJ98vVz1Pvp4JsGMWdJGBM+waMI2 J9MTvV98ZTN4bLqShrZjnlG3BNYzw4uka2mR5gPg4D9o159cmqO+hF/qKgkNK7G0Qw QQdMCdTbX6m7EHH0FX2FTdrCLcL13eTghPbnGAL0= 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 r11-11126] libstdc++: Adjust std::in_range template parameter name X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 359e9acdccd9e8f3b2030fb9ef9d68e47e825876 X-Git-Newrev: 87288696a2394cf8092d376e1db315e149a6f5b7 Message-Id: <20231206210115.E56EE385828B@sourceware.org> Date: Wed, 6 Dec 2023 21:01:15 +0000 (GMT) List-Id: https://gcc.gnu.org/g:87288696a2394cf8092d376e1db315e149a6f5b7 commit r11-11126-g87288696a2394cf8092d376e1db315e149a6f5b7 Author: Jonathan Wakely Date: Fri Nov 17 12:18:17 2023 +0000 libstdc++: Adjust std::in_range template parameter name This is more consistent with the specification in the standard. libstdc++-v3/ChangeLog: * include/std/utility (in_range): Rename _Up parameter to _Res. (cherry picked from commit 97fc8851f60fda381ac3bf6213a1cc93d9fda4f0) Diff: --- libstdc++-v3/include/std/utility | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libstdc++-v3/include/std/utility b/libstdc++-v3/include/std/utility index 7ebb8a552c1..4c288c6024d 100644 --- a/libstdc++-v3/include/std/utility +++ b/libstdc++-v3/include/std/utility @@ -443,22 +443,22 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION cmp_greater_equal(_Tp __t, _Up __u) noexcept { return !std::cmp_less(__t, __u); } - template + template constexpr bool in_range(_Tp __t) noexcept { - static_assert(__is_standard_integer<_Up>::value); + static_assert(__is_standard_integer<_Res>::value); static_assert(__is_standard_integer<_Tp>::value); using __gnu_cxx::__int_traits; - if constexpr (is_signed_v<_Tp> == is_signed_v<_Up>) - return __int_traits<_Up>::__min <= __t - && __t <= __int_traits<_Up>::__max; + if constexpr (is_signed_v<_Tp> == is_signed_v<_Res>) + return __int_traits<_Res>::__min <= __t + && __t <= __int_traits<_Res>::__max; else if constexpr (is_signed_v<_Tp>) return __t >= 0 - && make_unsigned_t<_Tp>(__t) <= __int_traits<_Up>::__max; + && make_unsigned_t<_Tp>(__t) <= __int_traits<_Res>::__max; else - return __t <= make_unsigned_t<_Up>(__int_traits<_Up>::__max); + return __t <= make_unsigned_t<_Res>(__int_traits<_Res>::__max); } #if __cplusplus > 202002L