Move folly/Hash.h to folly/hash/, leaving a shim

[folly.git] / folly / Bits.h

diff --git a/folly/Bits.h b/folly/Bits.h
index 63eaa4a1e9dd2de79080e71209f4554ef74367cd..4b71c18963600ebdd74b4eadc076d98cbf5fbb96 100644 (file)
--- a/folly/Bits.h
+++ b/folly/Bits.h
@@ -54,12 +54,11 @@
 
 #pragma once
 
-#if !defined(__clang__) && !(defined(_MSC_VER) && (_MSC_VER < 1900))
-#define FOLLY_INTRINSIC_CONSTEXPR constexpr
-#else
-// GCC and MSVC 2015+ are the only compilers with
-// intrinsics constexpr.
+// MSVC does not support intrinsics constexpr
+#if defined(_MSC_VER)
 #define FOLLY_INTRINSIC_CONSTEXPR const
+#else
+#define FOLLY_INTRINSIC_CONSTEXPR constexpr
 #endif
 
 #include <cassert>