Allow folly to compile cleanly with most of the rest of MSVC's sign mismatch warnings

[folly.git] / folly / Bits.h

diff --git a/folly/Bits.h b/folly/Bits.h
index 6c794b12cd4082d391c6dff0a25d2f8faa220abb..04a1b8eca0dd015f561ba28e0b056aa5909a0717 100644 (file)
--- a/folly/Bits.h
+++ b/folly/Bits.h
@@ -263,8 +263,11 @@ our_bswap16(Int16 x) {
 
 #endif
 
-#define FB_GEN(t, fn) \
-template<> inline t EndianIntBase<t>::swap(t x) { return fn(x); }
+#define FB_GEN(t, fn)                             \
+  template <>                                     \
+  inline t EndianIntBase<t>::swap(t x) {          \
+    return t(fn(std::make_unsigned<t>::type(x))); \
+  }
 
 // fn(x) expands to (x) if the second argument is empty, which is exactly
 // what we want for [u]int8_t. Also, gcc 4.7 on Intel doesn't have