mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-23 11:20:25 +08:00
51 lines
1.9 KiB
Diff
51 lines
1.9 KiB
Diff
|
diff --git a/folly/portability/Builtins.h b/folly/portability/Builtins.h
|
||
|
|
index 971cb88..7894333 100644
|
||
|
|
--- a/folly/portability/Builtins.h
|
||
|
|
+++ b/folly/portability/Builtins.h
|
||
|
|
@@ -41,7 +41,7 @@ FOLLY_ALWAYS_INLINE void __builtin___clear_cache(char* begin, char* end) {
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
-#if !defined(_MSC_VER) || (_MSC_VER < 1923)
|
||
|
|
+// #if !defined(_MSC_VER) || (_MSC_VER < 1923)
|
||
|
|
FOLLY_ALWAYS_INLINE int __builtin_clz(unsigned int x) {
|
||
|
|
unsigned long index;
|
||
|
|
return int(_BitScanReverse(&index, (unsigned long)x) ? 31 - index : 32);
|
||
|
|
@@ -93,7 +93,7 @@ FOLLY_ALWAYS_INLINE int __builtin_ctzll(unsigned long long x) {
|
||
|
|
return int(_BitScanForward64(&index, x) ? index : 64);
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
-#endif // !defined(_MSC_VER) || (_MSC_VER < 1923)
|
||
|
|
+// #endif // !defined(_MSC_VER) || (_MSC_VER < 1923)
|
||
|
|
|
||
|
|
FOLLY_ALWAYS_INLINE int __builtin_ffs(int x) {
|
||
|
|
unsigned long index;
|
||
|
|
@@ -119,15 +119,15 @@ FOLLY_ALWAYS_INLINE int __builtin_popcount(unsigned int x) {
|
||
|
|
return int(__popcnt(x));
|
||
|
|
}
|
||
|
|
|
||
|
|
-#if !defined(_MSC_VER) || (_MSC_VER < 1923)
|
||
|
|
+// #if !defined(_MSC_VER) || (_MSC_VER < 1923)
|
||
|
|
FOLLY_ALWAYS_INLINE int __builtin_popcountl(unsigned long x) {
|
||
|
|
static_assert(sizeof(x) == 4, "");
|
||
|
|
return int(__popcnt(x));
|
||
|
|
}
|
||
|
|
-#endif // !defined(_MSC_VER) || (_MSC_VER < 1923)
|
||
|
|
+// #endif // !defined(_MSC_VER) || (_MSC_VER < 1923)
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-#if !defined(_MSC_VER) || (_MSC_VER < 1923)
|
||
|
|
+// #if !defined(_MSC_VER) || (_MSC_VER < 1923)
|
||
|
|
#if defined(_M_IX86)
|
||
|
|
FOLLY_ALWAYS_INLINE int __builtin_popcountll(unsigned long long x) {
|
||
|
|
return int(__popcnt((unsigned int)(x >> 32))) +
|
||
|
|
@@ -138,7 +138,7 @@ FOLLY_ALWAYS_INLINE int __builtin_popcountll(unsigned long long x) {
|
||
|
|
return int(__popcnt64(x));
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
-#endif // !defined(_MSC_VER) || (_MSC_VER < 1923)
|
||
|
|
+// #endif // !defined(_MSC_VER) || (_MSC_VER < 1923)
|
||
|
|
|
||
|
|
FOLLY_ALWAYS_INLINE void* __builtin_return_address(unsigned int frame) {
|
||
|
|
// I really hope frame is zero...
|