|
47 | 47 |
|
48 | 48 | #if defined(_M_X64) && !defined(_M_ARM64EC) |
49 | 49 | #define _HAS_CHARCONV_INTRINSICS 1 |
50 | | -#else // ^^^ intrinsics available ^^^ / vvv intrinsics unavailable vvv |
| 50 | +#else // ^^^ intrinsics available / intrinsics unavailable vvv |
51 | 51 | #define _HAS_CHARCONV_INTRINSICS 0 |
52 | 52 | #endif // ^^^ intrinsics unavailable ^^^ |
53 | 53 |
|
54 | 54 | #if _HAS_CHARCONV_INTRINSICS |
55 | | -#include <intrin0.h> // for _umul128() and __shiftright128() |
| 55 | +#include _STL_INTRIN_HEADER // for _umul128() and __shiftright128() |
56 | 56 | #endif // ^^^ intrinsics available ^^^ |
57 | 57 |
|
58 | 58 | #if !_HAS_CXX17 |
@@ -161,7 +161,7 @@ _NODISCARD inline uint64_t __ryu_shiftright128(const uint64_t __lo, const uint64 |
161 | 161 | return __shiftright128(__lo, __hi, static_cast<unsigned char>(__dist)); |
162 | 162 | } |
163 | 163 |
|
164 | | -#else // ^^^ intrinsics available ^^^ / vvv intrinsics unavailable vvv |
| 164 | +#else // ^^^ intrinsics available / intrinsics unavailable vvv |
165 | 165 |
|
166 | 166 | _NODISCARD __forceinline uint64_t __ryu_umul128(const uint64_t __a, const uint64_t __b, uint64_t* const __productHi) { |
167 | 167 | // TRANSITION, VSO-634761 |
@@ -200,7 +200,7 @@ _NODISCARD inline uint64_t __ryu_shiftright128(const uint64_t __lo, const uint64 |
200 | 200 | #ifdef _WIN64 |
201 | 201 | _STL_INTERNAL_CHECK(__dist > 0); |
202 | 202 | return (__hi << (64 - __dist)) | (__lo >> __dist); |
203 | | -#else // ^^^ 64-bit ^^^ / vvv 32-bit vvv |
| 203 | +#else // ^^^ 64-bit / 32-bit vvv |
204 | 204 | // Avoid a 64-bit shift by taking advantage of the range of shift values. |
205 | 205 | _STL_INTERNAL_CHECK(__dist >= 32); |
206 | 206 | return (__hi << (64 - __dist)) | (static_cast<uint32_t>(__lo >> 32) >> (__dist - 32)); |
@@ -266,7 +266,7 @@ _NODISCARD inline uint32_t __mod1e9(const uint64_t __x) { |
266 | 266 | return static_cast<uint32_t>(__x) - 1000000000 * static_cast<uint32_t>(__div1e9(__x)); |
267 | 267 | } |
268 | 268 |
|
269 | | -#else // ^^^ 32-bit ^^^ / vvv 64-bit vvv |
| 269 | +#else // ^^^ 32-bit / 64-bit vvv |
270 | 270 |
|
271 | 271 | _NODISCARD inline uint64_t __div5(const uint64_t __x) { |
272 | 272 | return __x / 5; |
@@ -383,7 +383,7 @@ _NODISCARD inline uint32_t __mulShift_mod1e9(const uint64_t __m, const uint64_t* |
383 | 383 | const uint64_t __shiftedhigh = __s1high >> __dist; |
384 | 384 | const uint64_t __shiftedlow = __ryu_shiftright128(__s1low, __s1high, __dist); |
385 | 385 | return __uint128_mod1e9(__shiftedhigh, __shiftedlow); |
386 | | -#else // ^^^ intrinsics available ^^^ / vvv intrinsics unavailable vvv |
| 386 | +#else // ^^^ intrinsics available / intrinsics unavailable vvv |
387 | 387 | if (__j < 160) { // __j: [128, 160) |
388 | 388 | const uint64_t __r0 = __mod1e9(__s1high); |
389 | 389 | const uint64_t __r1 = __mod1e9((__r0 << 32) | (__s1low >> 32)); |
@@ -904,7 +904,7 @@ _NODISCARD inline to_chars_result __d2exp_buffered_n(char* _First, char* const _ |
904 | 904 | __roundUp = 1; |
905 | 905 | } else { |
906 | 906 | if (__roundUp == 1 || __c % 2 != 0) { |
907 | | - _Round[0] = __c + 1; |
| 907 | + _Round[0] = static_cast<char>(__c + 1); |
908 | 908 | } |
909 | 909 | break; |
910 | 910 | } |
@@ -1027,7 +1027,7 @@ _NODISCARD inline uint32_t __mulShift(const uint32_t __m, const uint64_t __facto |
1027 | 1027 | __bits1Hi += (__bits1Lo < __bits0Hi); |
1028 | 1028 | const int32_t __s = __shift - 32; |
1029 | 1029 | return (__bits1Hi << (32 - __s)) | (__bits1Lo >> __s); |
1030 | | -#else // ^^^ 32-bit ^^^ / vvv 64-bit vvv |
| 1030 | +#else // ^^^ 32-bit / 64-bit vvv |
1031 | 1031 | const uint64_t __sum = (__bits0 >> 32) + __bits1; |
1032 | 1032 | const uint64_t __shiftedSum = __sum >> (__shift - 32); |
1033 | 1033 | _STL_INTERNAL_CHECK(__shiftedSum <= UINT32_MAX); |
@@ -1318,7 +1318,7 @@ _NODISCARD pair<_CharT*, errc> __to_chars(_CharT* const _First, _CharT* const _L |
1318 | 1318 | chars_format _Fmt, const uint32_t __ieeeMantissa, const uint32_t __ieeeExponent) { |
1319 | 1319 | // Step 5: Print the decimal representation. |
1320 | 1320 | uint32_t _Output = __v.__mantissa; |
1321 | | - int32_t _Ryu_exponent = __v.__exponent; |
| 1321 | + const int32_t _Ryu_exponent = __v.__exponent; |
1322 | 1322 | const uint32_t __olength = __decimalLength9(_Output); |
1323 | 1323 | int32_t _Scientific_exponent = _Ryu_exponent + static_cast<int32_t>(__olength) - 1; |
1324 | 1324 |
|
@@ -1681,7 +1681,7 @@ _NODISCARD inline uint64_t __mulShiftAll(const uint64_t __m, const uint64_t* con |
1681 | 1681 | return __mulShift(4 * __m, __mul, __j); |
1682 | 1682 | } |
1683 | 1683 |
|
1684 | | -#else // ^^^ intrinsics available ^^^ / vvv intrinsics unavailable vvv |
| 1684 | +#else // ^^^ intrinsics available / intrinsics unavailable vvv |
1685 | 1685 |
|
1686 | 1686 | _NODISCARD __forceinline uint64_t __mulShiftAll(uint64_t __m, const uint64_t* const __mul, const int32_t __j, |
1687 | 1687 | uint64_t* const __vp, uint64_t* const __vm, const uint32_t __mmShift) { // TRANSITION, VSO-634761 |
@@ -1926,7 +1926,7 @@ _NODISCARD pair<_CharT*, errc> __to_chars(_CharT* const _First, _CharT* const _L |
1926 | 1926 | chars_format _Fmt, const double __f) { |
1927 | 1927 | // Step 5: Print the decimal representation. |
1928 | 1928 | uint64_t _Output = __v.__mantissa; |
1929 | | - int32_t _Ryu_exponent = __v.__exponent; |
| 1929 | + const int32_t _Ryu_exponent = __v.__exponent; |
1930 | 1930 | const uint32_t __olength = __decimalLength17(_Output); |
1931 | 1931 | int32_t _Scientific_exponent = _Ryu_exponent + static_cast<int32_t>(__olength) - 1; |
1932 | 1932 |
|
@@ -2050,7 +2050,7 @@ _NODISCARD pair<_CharT*, errc> __to_chars(_CharT* const _First, _CharT* const _L |
2050 | 2050 | unsigned long _Trailing_zero_bits; |
2051 | 2051 | #ifdef _WIN64 |
2052 | 2052 | (void) _BitScanForward64(&_Trailing_zero_bits, __v.__mantissa); // __v.__mantissa is guaranteed nonzero |
2053 | | -#else // ^^^ 64-bit ^^^ / vvv 32-bit vvv |
| 2053 | +#else // ^^^ 64-bit / 32-bit vvv |
2054 | 2054 | const uint32_t _Low_mantissa = static_cast<uint32_t>(__v.__mantissa); |
2055 | 2055 | if (_Low_mantissa != 0) { |
2056 | 2056 | (void) _BitScanForward(&_Trailing_zero_bits, _Low_mantissa); |
|
0 commit comments