1 files changed, 8 insertions, 11 deletions

diff --git a/src/mongo/db/mongod_options.cpp b/src/mongo/db/mongod_options.cpp
index 67b8b63545e..f77dce0fcc5 100644
--- a/src/mongo/db/mongod_options.cpp
+++ b/src/mongo/db/mongod_options.cpp
@@ -44,7 +44,6 @@
 #include "mongo/db/server_options.h"
 #include "mongo/db/server_options_helpers.h"
 #include "mongo/db/storage/mmap_v1/mmap_v1_options.h"
-#include "mongo/s/catalog/sharding_catalog_client.h"
 #include "mongo/util/log.h"
 #include "mongo/util/mongoutils/str.h"
 #include "mongo/util/net/ssl_options.h"
@@ -56,8 +55,6 @@ namespace mongo {
 
 using std::cout;
 using std::endl;
-using std::string;
-
 
 MongodGlobalParams mongodGlobalParams;
 
@@ -640,7 +637,7 @@ Status validateMongodOptions(const moe::Environment& params) {
 #ifdef _WIN32
     if (params.count("install") || params.count("reinstall")) {
         if (params.count("storage.dbPath") &&
-            !boost::filesystem::path(params["storage.dbPath"].as<string>()).is_absolute()) {
+            !boost::filesystem::path(params["storage.dbPath"].as<std::string>()).is_absolute()) {
             return Status(ErrorCodes::BadValue,
                           "dbPath requires an absolute file path with Windows services");
         }
@@ -943,12 +940,12 @@ Status storeMongodOptions(const moe::Environment& params) {
     }
 
     if (params.count("storage.engine")) {
-        storageGlobalParams.engine = params["storage.engine"].as<string>();
+        storageGlobalParams.engine = params["storage.engine"].as<std::string>();
         storageGlobalParams.engineSetByUser = true;
     }
 
     if (params.count("storage.dbPath")) {
-        storageGlobalParams.dbpath = params["storage.dbPath"].as<string>();
+        storageGlobalParams.dbpath = params["storage.dbPath"].as<std::string>();
         if (params.count("processManagement.fork") && storageGlobalParams.dbpath[0] != '/') {
             // we need to change dbpath if we fork since we change
             // cwd to "/"
@@ -1116,17 +1113,17 @@ Status storeMongodOptions(const moe::Environment& params) {
     }
     if (params.count("source")) {
         /* specifies what the source in local.sources should be */
-        replSettings.setSource(params["source"].as<string>().c_str());
+        replSettings.setSource(params["source"].as<std::string>().c_str());
     }
     if (params.count("pretouch")) {
         replSettings.setPretouch(params["pretouch"].as<int>());
     }
     if (params.count("replication.replSetName")) {
-        replSettings.setReplSetString(params["replication.replSetName"].as<string>().c_str());
+        replSettings.setReplSetString(params["replication.replSetName"].as<std::string>().c_str());
     }
     if (params.count("replication.replSet")) {
         /* seed list of hosts for the repl set */
-        replSettings.setReplSetString(params["replication.replSet"].as<string>().c_str());
+        replSettings.setReplSetString(params["replication.replSet"].as<std::string>().c_str());
     }
     if (params.count("replication.secondaryIndexPrefetch")) {
         replSettings.setPrefetchIndexMode(
@@ -1146,7 +1143,7 @@ Status storeMongodOptions(const moe::Environment& params) {
     }
 
     if (params.count("only")) {
-        replSettings.setOnly(params["only"].as<string>().c_str());
+        replSettings.setOnly(params["only"].as<std::string>().c_str());
     }
     if (params.count("storage.mmapv1.nsSize")) {
         int x = params["storage.mmapv1.nsSize"].as<int>();
@@ -1255,7 +1252,7 @@ Status storeMongodOptions(const moe::Environment& params) {
 
     // needs to be after things like --configsvr parsing, thus here.
     if (params.count("storage.repairPath")) {
-        storageGlobalParams.repairpath = params["storage.repairPath"].as<string>();
+        storageGlobalParams.repairpath = params["storage.repairPath"].as<std::string>();
         if (!storageGlobalParams.repairpath.size()) {
             return Status(ErrorCodes::BadValue, "repairpath is empty");
         }