Imported Upstream version 1.6.0

1 files changed, 3 insertions, 2 deletions

diff --git a/db/json.h b/db/json.h
index c65785a..68dae04 100644
--- a/db/json.h
+++ b/db/json.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "../stdafx.h"
+#include "../pch.h"
 #include "jsobj.h"
 
 namespace mongo {
@@ -35,6 +35,7 @@ namespace mongo {
     */
     BSONObj fromjson(const string &str);
 
-    BSONObj fromjson(const char *str);
+    /** len will be size of JSON object in text chars. */
+    BSONObj fromjson(const char *str, int* len=NULL);
 
 } // namespace mongo