Change to std::string on files depending on s2

1 files changed, 5 insertions, 4 deletions

diff --git a/src/mongo/db/index/external_key_generator.cpp b/src/mongo/db/index/external_key_generator.cpp
index 9f93bd6f439..cf2ba7d9a4b 100644
--- a/src/mongo/db/index/external_key_generator.cpp
+++ b/src/mongo/db/index/external_key_generator.cpp
@@ -29,6 +29,7 @@
 #include "mongo/db/index/external_key_generator.h"
 
 #include <cmath>
+#include <string>
 
 #include "mongo/db/fts/fts_spec.h"
 #include "mongo/db/index/s2_common.h"
@@ -45,15 +46,15 @@ namespace {
 void getKeysForUpgradeChecking(const BSONObj& infoObj, const BSONObj& doc, BSONObjSet* keys) {
     BSONObj keyPattern = infoObj.getObjectField("key");
 
-    string type = IndexNames::findPluginName(keyPattern);
+    std::string type = IndexNames::findPluginName(keyPattern);
 
     if (IndexNames::GEO_2D == type) {
         TwoDIndexingParams params;
         ExpressionParams::parseTwoDParams(infoObj, &params);
         ExpressionKeysPrivate::get2DKeys(doc, params, keys, NULL);
     } else if (IndexNames::GEO_HAYSTACK == type) {
-        string geoField;
-        vector<string> otherFields;
+        std::string geoField;
+        std::vector<std::string> otherFields;
         double bucketSize;
         ExpressionParams::parseHaystackParams(infoObj, &geoField, &otherFields, &bucketSize);
         ExpressionKeysPrivate::getHaystackKeys(doc, geoField, otherFields, bucketSize, keys);
@@ -67,7 +68,7 @@ void getKeysForUpgradeChecking(const BSONObj& infoObj, const BSONObj& doc, BSONO
     } else if (IndexNames::HASHED == type) {
         HashSeed seed;
         int version;
-        string field;
+        std::string field;
         ExpressionParams::parseHashParams(infoObj, &seed, &version, &field);
         ExpressionKeysPrivate::getHashKeys(
             doc, field, seed, version, infoObj["sparse"].trueValue(), keys);