move assignment operators for folly::Synchronized

[folly.git] / folly / json.h

diff --git a/folly/json.h b/folly/json.h
index 87d006627351dd5ffbfffed7164de5ff55f22a7f..84a70661c8fd790cfb4f4aa314f5cc4421b257c0 100644 (file)
--- a/folly/json.h
+++ b/folly/json.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Facebook, Inc.
+ * Copyright 2013 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -90,6 +90,14 @@ namespace json {
    */
   fbstring serialize(dynamic const&, serialization_opts const&);
 
+  /*
+   * Escape a string so that it is legal to print it in JSON text and
+   * append the result to out.
+   */
+
+  void escapeString(StringPiece input,
+                    fbstring& out,
+                    const serialization_opts& opts);
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -98,6 +106,7 @@ namespace json {
  * Parse a json blob out of a range and produce a dynamic representing
  * it.
  */
+dynamic parseJson(StringPiece, json::serialization_opts const&);
 dynamic parseJson(StringPiece);
 
 /*