diff --git a/stl/inc/__msvc_bit_utils.hpp b/stl/inc/__msvc_bit_utils.hpp index 46824ee80f4..0231603c9bc 100644 --- a/stl/inc/__msvc_bit_utils.hpp +++ b/stl/inc/__msvc_bit_utils.hpp @@ -310,7 +310,7 @@ _NODISCARD int _Checked_popcount(const _Ty _Val) noexcept { template constexpr bool _Is_standard_unsigned_integer = - _Is_any_of_v, 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 , int> = 0> _NODISCARD _CONSTEXPR20 int _Countr_zero(const _Ty _Val) noexcept { diff --git a/stl/inc/mdspan b/stl/inc/mdspan index 962dc9b9aaa..a8d4134ab8e 100644 --- a/stl/inc/mdspan +++ b/stl/inc/mdspan @@ -147,7 +147,7 @@ private: _STL_INTERNAL_STATIC_ASSERT(is_convertible_v && is_nothrow_constructible_v); #if _ITERATOR_DEBUG_LEVEL != 0 - if constexpr (_Is_standard_integer<_OtherIndexType> && _Rank_dynamic != 0) { + if constexpr (_Is_standard_integer> && _Rank_dynamic != 0) { _STL_VERIFY(((_Dynamic_exts[_Indices] >= 0 && _STD in_range(_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 && is_nothrow_constructible_v); #if _ITERATOR_DEBUG_LEVEL != 0 - if constexpr (_Is_standard_integer<_OtherIndexType>) { + if constexpr (_Is_standard_integer>) { for (rank_type _Idx = 0; _Idx < _Rank; ++_Idx) { _STL_VERIFY( _Static_extents[_Idx] == dynamic_extent || _STD cmp_equal(_Static_extents[_Idx], _Mixed_exts[_Idx]), diff --git a/stl/inc/utility b/stl/inc/utility index ceb98ae3ee1..662e08c0e27 100644 --- a/stl/inc/utility +++ b/stl/inc/utility @@ -949,8 +949,8 @@ _NODISCARD constexpr bool _In_range(const _Ty _Value) noexcept { #if _HAS_CXX20 template -constexpr bool _Is_standard_integer = _Is_any_of_v, 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 _NODISCARD constexpr bool cmp_equal(const _Ty1 _Left, const _Ty2 _Right) noexcept {