diff options
| author | Jonathan Reams <jbreams@mongodb.com> | 2017-01-03 15:02:10 -0500 |
|---|---|---|
| committer | Jonathan Reams <jbreams@mongodb.com> | 2017-01-06 12:50:48 -0500 |
| commit | f96f0ea2279962f31b18af1232ef11acfcb9f932 (patch) | |
| tree | 5f0728b7533e36db7b77c01fcd4f7fc85d71217f /src/mongo/bson | |
| parent | c8d0e9352718e9477dc9113e4c44a7a4aa314e5c (diff) | |
| download | mongo-f96f0ea2279962f31b18af1232ef11acfcb9f932.tar.gz | |
SERVER-14148 Remove JS mode from JSON output options
Diffstat (limited to 'src/mongo/bson')
| -rw-r--r-- | src/mongo/bson/bsonelement.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/bson/json.h | 2 | ||||
| -rw-r--r-- | src/mongo/bson/oid.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/mongo/bson/bsonelement.cpp b/src/mongo/bson/bsonelement.cpp index 4417821f816..679367f1c18 100644 --- a/src/mongo/bson/bsonelement.cpp +++ b/src/mongo/bson/bsonelement.cpp @@ -70,7 +70,7 @@ string BSONElement::jsonString(JsonStringFormat format, bool includeFieldNames, } break; case NumberInt: - if (format == JS) { + if (format == TenGen) { s << "NumberInt(" << _numberInt() << ")"; break; } diff --git a/src/mongo/bson/json.h b/src/mongo/bson/json.h index 5e5516607a1..81bf78ace36 100644 --- a/src/mongo/bson/json.h +++ b/src/mongo/bson/json.h @@ -73,7 +73,7 @@ bool isArray(StringData str); * Convert a BSONArray to a JSON string. * * @param arr The BSON Array. - * @param format The JSON format (JS, TenGen, Strict). + * @param format The JSON format (TenGen, Strict). * @param pretty Enables pretty output. */ std::string tojson(const BSONArray& arr, JsonStringFormat format = Strict, bool pretty = false); diff --git a/src/mongo/bson/oid.h b/src/mongo/bson/oid.h index 0dbf28a3277..c3895f35cde 100644 --- a/src/mongo/bson/oid.h +++ b/src/mongo/bson/oid.h @@ -235,8 +235,6 @@ enum JsonStringFormat { /** 10gen format, which is close to JS format. This form is understandable by javascript running inside the Mongo server via eval() */ TenGen, - /** Javascript JSON compatible */ - JS }; inline bool operator==(const OID& lhs, const OID& rhs) { |