Skip to content

F
fmt
Commit bb0db5e5 authored by Victor Zverovich's avatar Victor Zverovich
Browse files
Options

clang-format

parent 16410056
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
include/fmt/format.h
View file @ bb0db5e5
...@@ -196,7 +196,8 @@ FMT_END_NAMESPACE ...@@ -196,7 +196,8 @@ FMT_END_NAMESPACE
// Some compilers masquerade as both MSVC and GCC-likes or otherwise support // Some compilers masquerade as both MSVC and GCC-likes or otherwise support
// __builtin_clz and __builtin_clzll, so only define FMT_BUILTIN_CLZ using the // __builtin_clz and __builtin_clzll, so only define FMT_BUILTIN_CLZ using the
// MSVC intrinsics if the clz and clzll builtins are not available. // MSVC intrinsics if the clz and clzll builtins are not available.
#if FMT_MSC_VER && !defined(FMT_BUILTIN_CLZLL) && !defined(FMT_BUILTIN_CTZLL) && !defined(_MANAGED) #if FMT_MSC_VER && !defined(FMT_BUILTIN_CLZLL) && \
!defined(FMT_BUILTIN_CTZLL) && !defined(_MANAGED)
FMT_BEGIN_NAMESPACE FMT_BEGIN_NAMESPACE
namespace detail { namespace detail {
// Avoid Clang with Microsoft CodeGen's -Wunknown-pragmas warning. // Avoid Clang with Microsoft CodeGen's -Wunknown-pragmas warning.
...@@ -260,8 +261,7 @@ inline int ctzll(uint64_t x) { ...@@ -260,8 +261,7 @@ inline int ctzll(uint64_t x) {
_BitScanForward64(&r, x); _BitScanForward64(&r, x);
# else # else
// Scan the low 32 bits. // Scan the low 32 bits.
if (_BitScanForward(&r, static_cast<uint32_t>(x))) if (_BitScanForward(&r, static_cast<uint32_t>(x))) return static_cast<int>(r);
return static_cast<int>(r);
// Scan the high 32 bits. // Scan the high 32 bits.
_BitScanForward(&r, static_cast<uint32_t>(x >> 32)); _BitScanForward(&r, static_cast<uint32_t>(x >> 32));
r += 32; r += 32;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment