Make a few implicit truncations either explicit, or not truncate

[folly.git] / folly / json.cpp

diff --git a/folly/json.cpp b/folly/json.cpp
index ae2f2937ff95d52bd95fb37f74267f8955e7b737..ee56f0b1ea40634802e4720d7bdba94a10863f0a 100644 (file)
--- a/folly/json.cpp
+++ b/folly/json.cpp
@@ -615,8 +615,8 @@ std::string serialize(dynamic const& dyn, serialization_opts const& opts) {
 template <class T>
 size_t firstEscapableInWord(T s) {
   static_assert(std::is_unsigned<T>::value, "Unsigned integer required");
-  constexpr T kOnes = ~T() / 255; // 0x...0101
-  constexpr T kMsbs = kOnes * 0x80; // 0x...8080
+  static constexpr T kOnes = ~T() / 255; // 0x...0101
+  static constexpr T kMsbs = kOnes * 0x80; // 0x...8080
 
   // Sets the MSB of bytes < b. Precondition: b < 128.
   auto isLess = [](T w, uint8_t b) {