[gcc r13-8103] libstdc++: Adjust std::in_range template parameter name

Jonathan Wakely redi@gcc.gnu.org
Tue Nov 28 22:30:13 GMT 2023


https://gcc.gnu.org/g:cabab07202849c34c0c95bbad073cab16e5a0cb8

commit r13-8103-gcabab07202849c34c0c95bbad073cab16e5a0cb8
Author: Jonathan Wakely <jwakely@redhat.com>
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 006b19c00fc..549ef875362 100644
--- a/libstdc++-v3/include/std/utility
+++ b/libstdc++-v3/include/std/utility
@@ -164,22 +164,22 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     cmp_greater_equal(_Tp __t, _Up __u) noexcept
     { return !std::cmp_less(__t, __u); }
 
-  template<typename _Up, typename _Tp>
+  template<typename _Res, typename _Tp>
     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


More information about the Libstdc++-cvs mailing list