Workaround broken __builtin_clz in clang with MS codegen (#519)

8fa9acb8 · Victor Zverovich · 3dae2582 · 8fa9acb8
Commit 8fa9acb8 authored Feb 01, 2018 by Victor Zverovich
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

include/fmt/format.h include/fmt/format.h +9 -5

No files found.
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -140,12 +140,16 @@
 # endif
 #endif
-#if FMT_GCC_VERSION >= 400 || FMT_HAS_BUILTIN(__builtin_clz)
+// __builtin_clz is broken in clang with Microsoft CodeGen:
-# define FMT_BUILTIN_CLZ(n) __builtin_clz(n)
+// https://github.com/fmtlib/fmt/issues/519
-#endif
+#ifndef _MSC_VER
+# if FMT_GCC_VERSION >= 400 || FMT_HAS_BUILTIN(__builtin_clz)
+#  define FMT_BUILTIN_CLZ(n) __builtin_clz(n)
+# endif
-#if FMT_GCC_VERSION >= 400 || FMT_HAS_BUILTIN(__builtin_clzll)
+# if FMT_GCC_VERSION >= 400 || FMT_HAS_BUILTIN(__builtin_clzll)
-# define FMT_BUILTIN_CLZLL(n) __builtin_clzll(n)
+#  define FMT_BUILTIN_CLZLL(n) __builtin_clzll(n)
+# endif
 #endif
 // Some compilers masquerade as both MSVC and GCC-likes or otherwise support