Define ctz builtins only on some versions of MSVC

joshuakarp · Sep 14, 2020 · 5ca2fdb · 5ca2fdb
1 parent 33eea51
commit 5ca2fdb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/include/souffle/datastructure/PiggyList.h b/src/include/souffle/datastructure/PiggyList.h
@@ -9,9 +9,10 @@
 
 #ifdef _WIN32
 /**
- * MSVC does not provide a builtin for counting leading zeroes like gcc,
- * so we have to implement it ourselves.
+ * Some versions of MSVC do not provide a builtin for counting leading zeroes
+ * like gcc, so we have to implement it ourselves.
  */
+#if _MSC_VER < 1924
 unsigned long __inline __builtin_clzll(unsigned long long value) {
     unsigned long msb = 0;
 
@@ -20,7 +21,8 @@ unsigned long __inline __builtin_clzll(unsigned long long value) {
     else
         return 64;
 }
-#endif  // _WIN32
+#endif // _MSC_VER < 1924
+#endif // _WIN32
 
 using std::size_t;
 namespace souffle {

diff --git a/src/include/souffle/utility/MiscUtil.h b/src/include/souffle/utility/MiscUtil.h
@@ -48,6 +48,7 @@
  */
 #define __builtin_popcountll __popcnt64
 
+#if _MSC_VER < 1924
 constexpr unsigned long __builtin_ctz(unsigned long value) {
     unsigned long trailing_zeroes = 0;
     while ((value = value >> 1) ^ 1) {
@@ -65,6 +66,7 @@ inline unsigned long __builtin_ctzll(unsigned long long value) {
         return 64;
     }
 }
+#endif // _MSC_VER < 1924
 #endif
 
 // -------------------------------------------------------------------------------