diff options
Diffstat (limited to 'src/mongo/db/json.h')
| -rw-r--r-- | src/mongo/db/json.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mongo/db/json.h b/src/mongo/db/json.h index 04c881fa77d..4df19f756d5 100644 --- a/src/mongo/db/json.h +++ b/src/mongo/db/json.h @@ -42,7 +42,7 @@ namespace mongo { * extensions extensions described here * <http://dochub.mongodb.org/core/mongodbextendedjson>, this function * accepts unquoted field names and allows single quotes to optionally be - * used when specifying field names and string values instead of double + * used when specifying field names and std::string values instead of double * quotes. JSON unicode escape sequences (of the form \uXXXX) are * converted to utf8. * @@ -130,13 +130,13 @@ namespace mongo { * context. */ /* * OIDOBJECT : - * { FIELD("$oid") : <24 character hex string> } + * { FIELD("$oid") : <24 character hex std::string> } */ Status objectIdObject(const StringData& fieldName, BSONObjBuilder&); /* * BINARYOBJECT : - * { FIELD("$binary") : <base64 representation of a binary string>, + * { FIELD("$binary") : <base64 representation of a binary std::string>, * FIELD("$type") : <hexadecimal representation of a single byte * indicating the data type> } */ @@ -169,9 +169,9 @@ namespace mongo { /* * REFOBJECT : * { FIELD("$ref") : <string representing collection name>, - * FIELD("$id") : <24 character hex string> } - * | { FIELD("$ref") : STRING , FIELD("$id") : OBJECTID } - * | { FIELD("$ref") : STRING , FIELD("$id") : OIDOBJECT } + * FIELD("$id") : <24 character hex std::string> } + * | { FIELD("$ref") : std::string , FIELD("$id") : OBJECTID } + * | { FIELD("$ref") : std::string , FIELD("$id") : OIDOBJECT } */ Status dbRefObject(const StringData& fieldName, BSONObjBuilder&); @@ -222,7 +222,7 @@ namespace mongo { /* * OBJECTID : - * ObjectId( <24 character hex string> ) + * ObjectId( <24 character hex std::string> ) */ Status objectId(const StringData& fieldName, BSONObjBuilder&); @@ -240,7 +240,7 @@ namespace mongo { /* * DBREF : - * Dbref( <namespace string> , <24 character hex string> ) + * Dbref( <namespace std::string> , <24 character hex std::string> ) */ Status dbRef(const StringData& fieldName, BSONObjBuilder&); @@ -304,7 +304,7 @@ namespace mongo { Status field(std::string* result); /* - * STRING : + * std::string : * " " * | ' ' * | " CHARS " @@ -317,7 +317,7 @@ namespace mongo { * CHAR * | CHAR CHARS * - * Note: " or ' may be allowed depending on whether the string is + * Note: " or ' may be allowed depending on whether the std::string is * double or single quoted * * CHAR : @@ -350,7 +350,7 @@ namespace mongo { /** * Converts the two byte Unicode code point to its UTF8 character - * encoding representation. This function returns a string because + * encoding representation. This function returns a std::string because * UTF8 encodings for code points from 0x0000 to 0xFFFF can range * from one to three characters. */ @@ -393,12 +393,12 @@ namespace mongo { bool match(char matchChar, const char* matchSet) const; /** - * @return true if every character in the string is a hex digit + * @return true if every character in the std::string is a hex digit */ bool isHexString(const StringData&) const; /** - * @return true if every character in the string is a valid base64 + * @return true if every character in the std::string is a valid base64 * character */ bool isBase64String(const StringData&) const; @@ -417,7 +417,7 @@ namespace mongo { * _input - cursor we advance in our input buffer * _input_end - sentinel for the end of our input buffer * - * _buf is the null terminated buffer containing the JSON string we + * _buf is the null terminated buffer containing the JSON std::string we * are parsing. _input_end points to the null byte at the end of * the buffer. strtoll, strtol, and strtod will access the null * byte at the end of the buffer because they are assuming a c-style |