diff options
author | Qingyang Chen <qingyang.chen@10gen.com> | 2015-07-01 16:34:41 -0400 |
---|---|---|
committer | Qingyang Chen <qingyang.chen@10gen.com> | 2015-07-06 10:51:24 -0400 |
commit | 875b1b06e49f12c4e55200d441bcdeefc07d8310 (patch) | |
tree | c2fff98611d57d4aec85ec9036aa9ffd21e87cea /src/mongo/db/dbhelpers.cpp | |
parent | 2f6e7ad9733e4b0532038f193f071a37c321c26d (diff) | |
download | mongo-875b1b06e49f12c4e55200d441bcdeefc07d8310.tar.gz |
SERVER-19247 remove implicit conversion from NamespaceString to std::string
Diffstat (limited to 'src/mongo/db/dbhelpers.cpp')
-rw-r--r-- | src/mongo/db/dbhelpers.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/dbhelpers.cpp b/src/mongo/db/dbhelpers.cpp index b4e76483a1f..0fe1949c452 100644 --- a/src/mongo/db/dbhelpers.cpp +++ b/src/mongo/db/dbhelpers.cpp @@ -85,7 +85,7 @@ void Helpers::ensureIndex(OperationContext* txn, const char* name) { BSONObjBuilder b; b.append("name", name); - b.append("ns", collection->ns()); + b.append("ns", collection->ns().ns()); b.append("key", keyPattern); b.appendBool("unique", unique); BSONObj o = b.done(); @@ -131,7 +131,7 @@ RecordId Helpers::findOne(OperationContext* txn, const WhereCallbackReal whereCallback(txn, collection->ns().db()); - auto statusWithCQ = CanonicalQuery::canonicalize(collection->ns(), query, whereCallback); + auto statusWithCQ = CanonicalQuery::canonicalize(collection->ns().ns(), query, whereCallback); massert(17244, "Could not canonicalize " + query.toString(), statusWithCQ.isOK()); unique_ptr<CanonicalQuery> cq = std::move(statusWithCQ.getValue()); |