Remove remove_cv_t from standard integer type checks (#5946)

Co-authored-by: [email protected] <[email protected]>
Co-authored-by: Stephan T. Lavavej <[email protected]>

Author: 3 people

stl/inc/__msvc_bit_utils.hpp

@@ -310,7 +310,7 @@ _NODISCARD int _Checked_popcount(const _Ty _Val) noexcept {
 
 template <class _Ty>
 constexpr bool _Is_standard_unsigned_integer =
-    _Is_any_of_v<remove_cv_t<_Ty>, unsigned char, unsigned short, unsigned int, unsigned long, unsigned long long>;
+    _Is_any_of_v<_Ty, unsigned char, unsigned short, unsigned int, unsigned long, unsigned long long>;
 
 template <class _Ty, enable_if_t<_Is_standard_unsigned_integer<_Ty>, int> = 0>
 _NODISCARD _CONSTEXPR20 int _Countr_zero(const _Ty _Val) noexcept {

stl/inc/mdspan

@@ -147,7 +147,7 @@ private:
         _STL_INTERNAL_STATIC_ASSERT(is_convertible_v<const _OtherIndexType&, index_type>
                                     && is_nothrow_constructible_v<index_type, const _OtherIndexType&>);
 #if _ITERATOR_DEBUG_LEVEL != 0
-        if constexpr (_Is_standard_integer<_OtherIndexType> && _Rank_dynamic != 0) {
+        if constexpr (_Is_standard_integer<remove_cv_t<_OtherIndexType>> && _Rank_dynamic != 0) {
             _STL_VERIFY(((_Dynamic_exts[_Indices] >= 0 && _STD in_range<index_type>(_Dynamic_exts[_Indices])) && ...),
                 "exts[r] must be representable as a nonnegative value of type index_type for every rank index r "
                 "(N4950 [mdspan.extents.cons]/10.2)");
@@ -162,7 +162,7 @@ private:
         _STL_INTERNAL_STATIC_ASSERT(is_convertible_v<const _OtherIndexType&, index_type>
                                     && is_nothrow_constructible_v<index_type, const _OtherIndexType&>);
 #if _ITERATOR_DEBUG_LEVEL != 0
-        if constexpr (_Is_standard_integer<_OtherIndexType>) {
+        if constexpr (_Is_standard_integer<remove_cv_t<_OtherIndexType>>) {
             for (rank_type _Idx = 0; _Idx < _Rank; ++_Idx) {
                 _STL_VERIFY(
                     _Static_extents[_Idx] == dynamic_extent || _STD cmp_equal(_Static_extents[_Idx], _Mixed_exts[_Idx]),

stl/inc/utility

@@ -949,8 +949,8 @@ _NODISCARD constexpr bool _In_range(const _Ty _Value) noexcept {
 
 #if _HAS_CXX20
 template <class _Ty>
-constexpr bool _Is_standard_integer = _Is_any_of_v<remove_cv_t<_Ty>, signed char, short, int, long, long long,
-    unsigned char, unsigned short, unsigned int, unsigned long, unsigned long long>;
+constexpr bool _Is_standard_integer = _Is_any_of_v<_Ty, signed char, short, int, long, long long, unsigned char,
+    unsigned short, unsigned int, unsigned long, unsigned long long>;
 
 _EXPORT_STD template <class _Ty1, class _Ty2>
 _NODISCARD constexpr bool cmp_equal(const _Ty1 _Left, const _Ty2 _Right) noexcept {