SERVER-19247 remove implicit conversion from NamespaceString to std::string

1 files changed, 8 insertions, 8 deletions

diff --git a/src/mongo/db/commands/compact.cpp b/src/mongo/db/commands/compact.cpp
index a71357cb53a..df298009476 100644
--- a/src/mongo/db/commands/compact.cpp
+++ b/src/mongo/db/commands/compact.cpp
@@ -103,13 +103,13 @@ public:
             return false;
         }
 
-        NamespaceString ns(nsToCompact);
-        if (!ns.isNormal()) {
+        NamespaceString nss(nsToCompact);
+        if (!nss.isNormal()) {
             errmsg = "bad namespace name";
             return false;
         }
 
-        if (ns.isSystem()) {
+        if (nss.isSystem()) {
             // items in system.* cannot be moved as there might be pointers to them
             // i.e. system.indexes entries are pointed to from NamespaceDetails
             errmsg = "can't compact a system namespace";
@@ -150,7 +150,7 @@ public:
         ScopedTransaction transaction(txn, MODE_IX);
         AutoGetDb autoDb(txn, db, MODE_X);
         Database* const collDB = autoDb.getDb();
-        Collection* collection = collDB ? collDB->getCollection(ns) : NULL;
+        Collection* collection = collDB ? collDB->getCollection(nss) : NULL;
 
         // If db/collection does not exist, short circuit and return.
         if (!collDB || !collection) {
@@ -158,15 +158,15 @@ public:
             return false;
         }
 
-        OldClientContext ctx(txn, ns);
-        BackgroundOperation::assertNoBgOpInProgForNs(ns.ns());
+        OldClientContext ctx(txn, nss.ns());
+        BackgroundOperation::assertNoBgOpInProgForNs(nss.ns());
 
         if (collection->isCapped()) {
             errmsg = "cannot compact a capped collection";
             return false;
         }
 
-        log() << "compact " << ns << " begin, options: " << compactOptions.toString();
+        log() << "compact " << nss.ns() << " begin, options: " << compactOptions.toString();
 
         StatusWith<CompactStats> status = collection->compact(txn, &compactOptions);
         if (!status.isOK())
@@ -175,7 +175,7 @@ public:
         if (status.getValue().corruptDocuments > 0)
             result.append("invalidObjects", status.getValue().corruptDocuments);
 
-        log() << "compact " << ns << " end";
+        log() << "compact " << nss.ns() << " end";
 
         return true;
     }