Convert a polling loop to a futex wait

[folly.git] / folly / json.cpp

diff --git a/folly/json.cpp b/folly/json.cpp
index 4fb7d04acb131320c3100e21c20b796fb685ae49..a2b81d54799ff9831cb87046e87bce9cda9ea9e1 100644 (file)
--- a/folly/json.cpp
+++ b/folly/json.cpp
@@ -445,7 +445,7 @@ dynamic parseArray(Input& in) {
   assert(*in == '[');
   ++in;
 
-  dynamic ret = {};
+  dynamic ret = dynamic::array;
 
   in.skipWhitespace();
   if (*in == ']') {
@@ -691,7 +691,7 @@ void escapeString(StringPiece input,
         // checking that utf8 encodings are valid
         char32_t v = decodeUtf8(q, e, opts.skip_invalid_utf8);
         if (opts.skip_invalid_utf8 && v == U'\ufffd') {
-          out.append("\ufffd");
+          out.append(u8"\ufffd");
           p = q;
           continue;
         }