summaryrefslogtreecommitdiff
path: root/src/mongo/db/catalog/drop_collection.cpp
diff options
context:
space:
mode:
authorQingyang Chen <qingyang.chen@10gen.com>2015-07-01 16:34:41 -0400
committerQingyang Chen <qingyang.chen@10gen.com>2015-07-06 10:51:24 -0400
commit875b1b06e49f12c4e55200d441bcdeefc07d8310 (patch)
treec2fff98611d57d4aec85ec9036aa9ffd21e87cea /src/mongo/db/catalog/drop_collection.cpp
parent2f6e7ad9733e4b0532038f193f071a37c321c26d (diff)
downloadmongo-875b1b06e49f12c4e55200d441bcdeefc07d8310.tar.gz
SERVER-19247 remove implicit conversion from NamespaceString to std::string
Diffstat (limited to 'src/mongo/db/catalog/drop_collection.cpp')
-rw-r--r--src/mongo/db/catalog/drop_collection.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/catalog/drop_collection.cpp b/src/mongo/db/catalog/drop_collection.cpp
index 67bfb70ae45..fde665b76a8 100644
--- a/src/mongo/db/catalog/drop_collection.cpp
+++ b/src/mongo/db/catalog/drop_collection.cpp
@@ -68,7 +68,7 @@ Status dropCollection(OperationContext* txn,
if (!db || !coll) {
return Status(ErrorCodes::NamespaceNotFound, "ns not found");
}
- OldClientContext context(txn, collectionName);
+ OldClientContext context(txn, collectionName.ns());
bool userInitiatedWritesAndNotPrimary = txn->writesAreReplicated() &&
!repl::getGlobalReplicationCoordinator()->canAcceptWritesFor(collectionName);
@@ -86,7 +86,7 @@ Status dropCollection(OperationContext* txn,
WriteUnitOfWork wunit(txn);
Status s = db->dropCollection(txn, collectionName.ns());
- result.append("ns", collectionName);
+ result.append("ns", collectionName.ns());
if (!s.isOK()) {
return s;