mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-12-24 12:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix msvc version of clz & clzll (#1880)

Browse Source 
Change msvc version of clz & clzll to match __builtin_clz & _builtin_clzll
This commit is contained in:
jk-jeon 2020-09-18 11:07:01 -07:00 committed by GitHub
parent bc51a8df04
commit 42699bf408
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/fmt/format.h
View File

@ -195,7 +195,7 @@ namespace detail {
# ifndef __clang__
# pragma intrinsic(_BitScanReverse)
# endif
inline uint32_t clz(uint32_t x) {
inline int clz(uint32_t x) {
unsigned long r = 0;
_BitScanReverse(&r, x);
@ -204,7 +204,7 @@ inline uint32_t clz(uint32_t x) {
// "r", but the only way that can happen is if "x" is 0,
// which the callers guarantee to not happen.
FMT_SUPPRESS_MSC_WARNING(6102)
return 31 - r;
return 31 - static_cast<int>(r);
}
# define FMT_BUILTIN_CLZ(n) detail::clz(n)
@ -212,7 +212,7 @@ inline uint32_t clz(uint32_t x) {
# pragma intrinsic(_BitScanReverse64)
# endif
inline uint32_t clzll(uint64_t x) {
inline int clzll(uint64_t x) {
unsigned long r = 0;
# ifdef _WIN64
_BitScanReverse64(&r, x);
@ -229,7 +229,7 @@ inline uint32_t clzll(uint64_t x) {
// "r", but the only way that can happen is if "x" is 0,
// which the callers guarantee to not happen.
FMT_SUPPRESS_MSC_WARNING(6102)
return 63 - r;
return 63 - static_cast<int>(r);
}
# define FMT_BUILTIN_CLZLL(n) detail::clzll(n)
} // namespace detail