From 875b1b06e49f12c4e55200d441bcdeefc07d8310 Mon Sep 17 00:00:00 2001 From: Qingyang Chen Date: Wed, 1 Jul 2015 16:34:41 -0400 Subject: SERVER-19247 remove implicit conversion from NamespaceString to std::string --- src/mongo/db/catalog/drop_collection.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mongo/db/catalog/drop_collection.cpp') 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; -- cgit v1.2.1