SERVER-13256 Add std namespace qualifications in headers

53 files changed, 134 insertions, 134 deletions

diff --git a/src/mongo/client/sasl_scramsha1_client_conversation.h b/src/mongo/client/sasl_scramsha1_client_conversation.h
index 3aae34fa164..554e6813d9c 100644
--- a/src/mongo/client/sasl_scramsha1_client_conversation.h
+++ b/src/mongo/client/sasl_scramsha1_client_conversation.h
@@ -69,12 +69,12 @@ namespace mongo {
         /**
          * Parses server-first-message and generate client-final-message.
          **/
-        StatusWith<bool> _secondStep(const std::vector<string>& input, std::string* outputData);
+        StatusWith<bool> _secondStep(const std::vector<std::string>& input, std::string* outputData);
 
         /**
          * Generates client-first-message.
          **/
-        StatusWith<bool> _thirdStep(const std::vector<string>& input, std::string* outputData);
+        StatusWith<bool> _thirdStep(const std::vector<std::string>& input, std::string* outputData);
 
         int _step;
         std::string _authMessage;
diff --git a/src/mongo/client/syncclusterconnection.h b/src/mongo/client/syncclusterconnection.h
index 9a1537ea773..30790440478 100644
--- a/src/mongo/client/syncclusterconnection.h
+++ b/src/mongo/client/syncclusterconnection.h
@@ -161,7 +161,7 @@ namespace mongo {
         boost::scoped_ptr<QueryHandler> _customQueryHandler;
 
         mongo::mutex _mutex;
-        map<string,int> _lockTypes;
+        std::map<std::string,int> _lockTypes;
         // End mutex
 
         double _socketTimeout;
@@ -179,20 +179,20 @@ namespace mongo {
         /**
          * Returns true if the query can be processed using this handler.
          */
-        virtual bool canHandleQuery( const string& ns, Query query ) = 0;
+        virtual bool canHandleQuery( const std::string& ns, Query query ) = 0;
 
         /**
          * Returns a cursor on one of the hosts with the desired results for the query.
          * May throw or return an empty auto_ptr on failure.
          */
-        virtual auto_ptr<DBClientCursor> handleQuery( const vector<string>& hosts,
-                                                      const string &ns,
-                                                      Query query,
-                                                      int nToReturn,
-                                                      int nToSkip,
-                                                      const BSONObj *fieldsToReturn,
-                                                      int queryOptions,
-                                                      int batchSize ) = 0;
+        virtual std::auto_ptr<DBClientCursor> handleQuery( const std::vector<std::string>& hosts,
+                                                           const std::string &ns,
+                                                           Query query,
+                                                           int nToReturn,
+                                                           int nToSkip,
+                                                           const BSONObj *fieldsToReturn,
+                                                           int queryOptions,
+                                                           int batchSize ) = 0;
     };
 
     class MONGO_CLIENT_API UpdateNotTheSame : public UserException {
diff --git a/src/mongo/db/auth/sasl_scramsha1_server_conversation.h b/src/mongo/db/auth/sasl_scramsha1_server_conversation.h
index e530da32559..85ff198b4d6 100644
--- a/src/mongo/db/auth/sasl_scramsha1_server_conversation.h
+++ b/src/mongo/db/auth/sasl_scramsha1_server_conversation.h
@@ -69,7 +69,7 @@ namespace mongo {
         /**
          * Parse client-final-message and generate server-final-message
          **/
-        StatusWith<bool> _secondStep(const std::vector<string>& input, std::string* outputData);
+        StatusWith<bool> _secondStep(const std::vector<std::string>& input, std::string* outputData);
 
         int _step;
         std::string _authMessage;
diff --git a/src/mongo/db/catalog/database.h b/src/mongo/db/catalog/database.h
index ae4f95e03b5..48f178abc88 100644
--- a/src/mongo/db/catalog/database.h
+++ b/src/mongo/db/catalog/database.h
@@ -109,8 +109,8 @@ namespace mongo {
          * 'duplicates' is specified, it is filled with all duplicate names.
          // TODO move???
          */
-        static string duplicateUncasedName( const std::string &name,
-                                            std::set< std::string > *duplicates = 0 );
+        static std::string duplicateUncasedName( const std::string &name,
+                                                 std::set< std::string > *duplicates = 0 );
 
         static Status validateDBName( const StringData& dbname );
 
diff --git a/src/mongo/db/catalog/index_catalog_entry.h b/src/mongo/db/catalog/index_catalog_entry.h
index aed569daa0d..114644d503d 100644
--- a/src/mongo/db/catalog/index_catalog_entry.h
+++ b/src/mongo/db/catalog/index_catalog_entry.h
@@ -55,7 +55,7 @@ namespace mongo {
 
         ~IndexCatalogEntry();
 
-        const string& ns() const { return _ns; }
+        const std::string& ns() const { return _ns; }
 
         void init( OperationContext* txn,
                    IndexAccessMethod* accessMethod );
@@ -98,7 +98,7 @@ namespace mongo {
 
         // -----
 
-        string _ns;
+        std::string _ns;
 
         CollectionCatalogEntry* _collection; // not owned here
 
diff --git a/src/mongo/db/cloner.h b/src/mongo/db/cloner.h
index 169460257cc..80dd941b19e 100644
--- a/src/mongo/db/cloner.h
+++ b/src/mongo/db/cloner.h
@@ -81,7 +81,7 @@ namespace mongo {
                   Query q);
 
         void copyIndexes(OperationContext* txn,
-                         const string& toDBName,
+                         const std::string& toDBName,
                          const NamespaceString& from_ns,
                          const NamespaceString& to_ns,
                          bool logForRepl,
diff --git a/src/mongo/db/commands/explain_cmd.h b/src/mongo/db/commands/explain_cmd.h
index bfb8dd5cf1a..5fab99fc8ff 100644
--- a/src/mongo/db/commands/explain_cmd.h
+++ b/src/mongo/db/commands/explain_cmd.h
@@ -65,7 +65,7 @@ namespace mongo {
 
         virtual bool adminOnly() const { return false; }
 
-        virtual void help( stringstream& help ) const {
+        virtual void help( std::stringstream& help ) const {
             help << "explain database reads and writes";
         }
 
@@ -79,9 +79,9 @@ namespace mongo {
                                            const BSONObj& cmdObj);
 
         virtual bool run(OperationContext* txn,
-                         const string& dbname,
+                         const std::string& dbname,
                          BSONObj& cmdObj, int options,
-                         string& errmsg,
+                         std::string& errmsg,
                          BSONObjBuilder& result,
                          bool fromRepl);
 
diff --git a/src/mongo/db/commands/find_cmd.h b/src/mongo/db/commands/find_cmd.h
index fd73674196e..e472ebc1271 100644
--- a/src/mongo/db/commands/find_cmd.h
+++ b/src/mongo/db/commands/find_cmd.h
@@ -55,7 +55,7 @@ namespace mongo {
 
         virtual bool adminOnly() const { return false; }
 
-        virtual void help( stringstream& help ) const {
+        virtual void help( std::stringstream& help ) const {
             help << "query for documents";
         }
 
@@ -77,9 +77,9 @@ namespace mongo {
          * TODO: This needs to be implemented. Currently it does nothing.
          */
         virtual bool run(OperationContext* txn,
-                         const string& dbname,
+                         const std::string& dbname,
                          BSONObj& cmdObj, int options,
-                         string& errmsg,
+                         std::string& errmsg,
                          BSONObjBuilder& result,
                          bool fromRepl);
 
diff --git a/src/mongo/db/commands/group.h b/src/mongo/db/commands/group.h
index c43be56ddab..0c46ec9456f 100644
--- a/src/mongo/db/commands/group.h
+++ b/src/mongo/db/commands/group.h
@@ -51,7 +51,7 @@ namespace mongo {
 
         virtual bool slaveOverrideOk() const { return true; }
 
-        virtual void help(stringstream& help) const {
+        virtual void help(std::stringstream& help) const {
             help << "http://dochub.mongodb.org/core/aggregation";
         }
 
@@ -82,7 +82,7 @@ namespace mongo {
          *
          * If a parsing error is encountered, returns an error Status.
          */
-        Status parseRequest(const string& dbname,
+        Status parseRequest(const std::string& dbname,
                             const BSONObj& cmdObj,
                             GroupRequest* request) const; 
     };
diff --git a/src/mongo/db/commands/server_status_internal.h b/src/mongo/db/commands/server_status_internal.h
index 2fbb69dc32b..37e3bbf3439 100644
--- a/src/mongo/db/commands/server_status_internal.h
+++ b/src/mongo/db/commands/server_status_internal.h
@@ -48,7 +48,7 @@ namespace mongo {
         static MetricTree* theMetricTree;
     private:
 
-        void _add( const string& path, ServerStatusMetric* metric );
+        void _add( const std::string& path, ServerStatusMetric* metric );
 
         std::map<std::string, MetricTree*> _subtrees;
         std::map<std::string, ServerStatusMetric*> _metrics;
diff --git a/src/mongo/db/commands/server_status_metric.h b/src/mongo/db/commands/server_status_metric.h
index 1f430d3a2c7..239c66fa96b 100644
--- a/src/mongo/db/commands/server_status_metric.h
+++ b/src/mongo/db/commands/server_status_metric.h
@@ -52,7 +52,7 @@ namespace mongo {
         virtual void appendAtLeaf( BSONObjBuilder& b ) const = 0;
 
     protected:
-        static string _parseLeafName( const std::string& name );
+        static std::string _parseLeafName( const std::string& name );
 
         const std::string _name;
         const std::string _leafName;
diff --git a/src/mongo/db/curop.h b/src/mongo/db/curop.h
index c38e2d8f2f3..4f3f27d1fe0 100644
--- a/src/mongo/db/curop.h
+++ b/src/mongo/db/curop.h
@@ -201,7 +201,7 @@ namespace mongo {
         void reset( const HostAndPort& remote, int op );
         void markCommand() { _isCommand = true; }
         OpDebug& debug()           { return _debug; }
-        string getNS() const { return _ns.toString(); }
+        std::string getNS() const { return _ns.toString(); }
 
         bool shouldDBProfile( int ms ) const {
             if ( _dbprofile <= 0 )
diff --git a/src/mongo/db/exec/multi_plan.h b/src/mongo/db/exec/multi_plan.h
index 22a8daded01..a793ee7127b 100644
--- a/src/mongo/db/exec/multi_plan.h
+++ b/src/mongo/db/exec/multi_plan.h
@@ -123,7 +123,7 @@ namespace mongo {
          * Gathers execution stats for all losing plans. Caller takes ownership of
          * all pointers in the returned vector.
          */
-        vector<PlanStageStats*> generateCandidateStats();
+        std::vector<PlanStageStats*> generateCandidateStats();
 
         static const char* kStageType;
 
diff --git a/src/mongo/db/exec/near.h b/src/mongo/db/exec/near.h
index 126bb04ab3e..258e9a755a8 100644
--- a/src/mongo/db/exec/near.h
+++ b/src/mongo/db/exec/near.h
@@ -88,7 +88,7 @@ namespace mongo {
         virtual void restoreState(OperationContext* opCtx);
         virtual void invalidate(OperationContext* txn, const RecordId& dl, InvalidationType type);
 
-        virtual vector<PlanStage*> getChildren() const;
+        virtual std::vector<PlanStage*> getChildren() const;
 
         virtual StageType stageType() const;
         virtual PlanStageStats* getStats();
diff --git a/src/mongo/db/exec/pipeline_proxy.h b/src/mongo/db/exec/pipeline_proxy.h
index d1eb5b4d25c..59a4d61d197 100644
--- a/src/mongo/db/exec/pipeline_proxy.h
+++ b/src/mongo/db/exec/pipeline_proxy.h
@@ -93,7 +93,7 @@ namespace mongo {
 
         // Things in the _stash sould be returned before pulling items from _pipeline.
         const boost::intrusive_ptr<Pipeline> _pipeline;
-        vector<BSONObj> _stash;
+        std::vector<BSONObj> _stash;
         const bool _includeMetaData;
         boost::weak_ptr<PlanExecutor> _childExec;
 
diff --git a/src/mongo/db/exec/plan_stats.h b/src/mongo/db/exec/plan_stats.h
index 8b5985adbae..a36dbe1f839 100644
--- a/src/mongo/db/exec/plan_stats.h
+++ b/src/mongo/db/exec/plan_stats.h
@@ -577,14 +577,14 @@ namespace mongo {
 
         long long totalResultsFound() {
             long long totalResultsFound = 0;
-            for (vector<IntervalStats>::iterator it = intervalStats.begin();
+            for (std::vector<IntervalStats>::iterator it = intervalStats.begin();
                 it != intervalStats.end(); ++it) {
                 totalResultsFound += it->numResultsFound;
             }
             return totalResultsFound;
         }
 
-        vector<IntervalStats> intervalStats;
+        std::vector<IntervalStats> intervalStats;
         std::string indexName;
         BSONObj keyPattern;
     };
diff --git a/src/mongo/db/geo/hash.h b/src/mongo/db/geo/hash.h
index ef64f014793..f03ecc7fa3f 100644
--- a/src/mongo/db/geo/hash.h
+++ b/src/mongo/db/geo/hash.h
@@ -137,7 +137,7 @@ namespace mongo {
         //
         // Requires: level < this->_bits, so that we can determine which vertex is
         // closest (in particular, level == kMaxBits is not allowed).
-        void appendVertexNeighbors(unsigned level, vector<GeoHash>* output) const;
+        void appendVertexNeighbors(unsigned level, std::vector<GeoHash>* output) const;
 
     private:
 
diff --git a/src/mongo/db/geo/r2_region_coverer.h b/src/mongo/db/geo/r2_region_coverer.h
index b94c3529a2f..ff4f820d755 100644
--- a/src/mongo/db/geo/r2_region_coverer.h
+++ b/src/mongo/db/geo/r2_region_coverer.h
@@ -64,7 +64,7 @@ namespace mongo {
         void setMaxCells(int maxCells);
         int maxCells() const { return _maxCells; }
 
-        void getCovering(const R2Region& region, vector<GeoHash>* cover);
+        void getCovering(const R2Region& region, std::vector<GeoHash>* cover);
 
     private:
         struct Candidate {
@@ -106,27 +106,27 @@ namespace mongo {
 
         // We keep the candidates that may intersect with this region in a priority queue.
         struct CompareQueueEntries;
-        typedef pair<int, Candidate*> QueueEntry;
-        typedef priority_queue<QueueEntry, vector<QueueEntry>,
-                               CompareQueueEntries> CandidateQueue;
+        typedef std::pair<int, Candidate*> QueueEntry;
+        typedef std::priority_queue<QueueEntry, std::vector<QueueEntry>,
+                                    CompareQueueEntries> CandidateQueue;
         boost::scoped_ptr<CandidateQueue> _candidateQueue;  // Priority queue owns candidate pointers.
-        boost::scoped_ptr<vector<GeoHash> > _results;
+        boost::scoped_ptr<std::vector<GeoHash> > _results;
     };
 
 
     // An R2CellUnion is a region consisting of cells of various sizes.
     class R2CellUnion : boost::noncopyable {
     public:
-        void init(const vector<GeoHash>& cellIds);
+        void init(const std::vector<GeoHash>& cellIds);
         bool contains(const GeoHash cellId) const;
-        string toString() const;
+        std::string toString() const;
     private:
         // Normalizes the cell union by discarding cells that are contained by other
         // cells, replacing groups of 4 child cells by their parent cell whenever
         // possible, and sorting all the cell ids in increasing order.  Returns true
         // if the number of cells was reduced.
         bool normalize();
-        vector<GeoHash> _cellIds;
+        std::vector<GeoHash> _cellIds;
     };
 
 } /* namespace mongo */
diff --git a/src/mongo/db/geo/shapes.h b/src/mongo/db/geo/shapes.h
index d67643f7823..297eb8135d3 100644
--- a/src/mongo/db/geo/shapes.h
+++ b/src/mongo/db/geo/shapes.h
@@ -70,7 +70,7 @@ namespace mongo {
     bool circleInteriorContainsBox(const Circle& circle, const Box& box);
     bool circleIntersectsWithBox(const Circle& circle, const Box& box);
     bool circleInteriorIntersectsWithBox(const Circle& circle, const Box& box);
-    bool edgesIntersectsWithBox(const vector<Point>& vertices, const Box& box);
+    bool edgesIntersectsWithBox(const std::vector<Point>& vertices, const Box& box);
     bool polygonContainsBox(const Polygon& polygon, const Box& box);
     bool polygonIntersectsWithBox(const Polygon& polygon, const Box& box);
 
diff --git a/src/mongo/db/index/btree_key_generator.h b/src/mongo/db/index/btree_key_generator.h
index 28031e1de6f..25bedca88e7 100644
--- a/src/mongo/db/index/btree_key_generator.h
+++ b/src/mongo/db/index/btree_key_generator.h
@@ -58,9 +58,9 @@ namespace mongo {
         BSONSizeTracker _sizeTracker;
     private:
         // We have V0 and V1.  Sigh.
-        virtual void getKeysImpl(vector<const char*> fieldNames, vector<BSONElement> fixed,
+        virtual void getKeysImpl(std::vector<const char*> fieldNames, std::vector<BSONElement> fixed,
                                  const BSONObj &obj, BSONObjSet *keys) const = 0;
-        vector<BSONElement> _fixed;
+        std::vector<BSONElement> _fixed;
     };
 
     class BtreeKeyGeneratorV0 : public BtreeKeyGenerator {
@@ -70,7 +70,7 @@ namespace mongo {
         virtual ~BtreeKeyGeneratorV0() { }
 
     private:
-        virtual void getKeysImpl(vector<const char*> fieldNames, vector<BSONElement> fixed,
+        virtual void getKeysImpl(std::vector<const char*> fieldNames, std::vector<BSONElement> fixed,
                                  const BSONObj &obj, BSONObjSet *keys) const;
     };
 
@@ -90,11 +90,11 @@ namespace mongo {
          * @param array - array from which keys should be extracted, based on names in fieldNames
          *        If obj and array are both nonempty, obj will be one of the elements of array.
          */        
-        virtual void getKeysImpl(vector<const char*> fieldNames, vector<BSONElement> fixed,
+        virtual void getKeysImpl(std::vector<const char*> fieldNames, std::vector<BSONElement> fixed,
                                  const BSONObj &obj, BSONObjSet *keys) const;
 
         // These guys are called by getKeysImpl.
-        void getKeysImplWithArray(vector<const char*> fieldNames, vector<BSONElement> fixed,
+        void getKeysImplWithArray(std::vector<const char*> fieldNames, std::vector<BSONElement> fixed,
                                   const BSONObj &obj, BSONObjSet *keys, unsigned numNotFound,
                                   const BSONObj &array) const;
         /**
@@ -103,10 +103,10 @@ namespace mongo {
          */
         BSONElement extractNextElement(const BSONObj &obj, const BSONObj &arr, const char *&field,
                                        bool &arrayNestedArray ) const;
-        void _getKeysArrEltFixed(vector<const char*> &fieldNames, vector<BSONElement> &fixed,
+        void _getKeysArrEltFixed(std::vector<const char*> &fieldNames, std::vector<BSONElement> &fixed,
                                  const BSONElement &arrEntry, BSONObjSet *keys,
                                  unsigned numNotFound, const BSONElement &arrObjElt,
-                                 const set<unsigned> &arrIdxs, bool mayExpandArrayUnembedded) const;
+                                 const std::set<unsigned> &arrIdxs, bool mayExpandArrayUnembedded) const;
 
         BSONObj _undefinedObj;
         BSONElement _undefinedElt;
diff --git a/src/mongo/db/operation_context.h b/src/mongo/db/operation_context.h
index 99bf8361ae6..f9a4fa4e2db 100644
--- a/src/mongo/db/operation_context.h
+++ b/src/mongo/db/operation_context.h
@@ -107,7 +107,7 @@ namespace mongo {
          *
          * TODO: We return a string because of hopefully transient CurOp thread-unsafe insanity.
          */
-        virtual string getNS() const = 0;
+        virtual std::string getNS() const = 0;
 
         /**
          * Returns true if this operation is under a GodScope.  Only used by DBDirectClient.
diff --git a/src/mongo/db/operation_context_impl.h b/src/mongo/db/operation_context_impl.h
index 306f343731e..29eaa91dffa 100644
--- a/src/mongo/db/operation_context_impl.h
+++ b/src/mongo/db/operation_context_impl.h
@@ -56,7 +56,7 @@ namespace mongo {
 
         virtual bool isGod() const;
 
-        virtual string getNS() const;
+        virtual std::string getNS() const;
 
         virtual Client* getClient() const;
 
diff --git a/src/mongo/db/operation_context_noop.h b/src/mongo/db/operation_context_noop.h
index 84c7d70a60b..ca567bd25e2 100644
--- a/src/mongo/db/operation_context_noop.h
+++ b/src/mongo/db/operation_context_noop.h
@@ -99,8 +99,8 @@ namespace mongo {
             return false;
         }
 
-        virtual string getNS() const {
-            return string();
+        virtual std::string getNS() const {
+            return std::string();
         };
 
         virtual unsigned int getOpID() const {
diff --git a/src/mongo/db/ops/path_support.h b/src/mongo/db/ops/path_support.h
index ce9d2bcf595..ed4515506b8 100644
--- a/src/mongo/db/ops/path_support.h
+++ b/src/mongo/db/ops/path_support.h
@@ -47,7 +47,7 @@ namespace mongo {
         static const size_t kMaxPaddingAllowed = 1500000;
 
         // Convenience type to hold equality matches at particular paths from a MatchExpression
-        typedef map<StringData, const EqualityMatchExpression*> EqualityMatches;
+        typedef std::map<StringData, const EqualityMatchExpression*> EqualityMatches;
 
         /**
          * Finds the longest portion of 'prefix' that exists in document rooted at 'root' and is
diff --git a/src/mongo/db/ops/update_driver.h b/src/mongo/db/ops/update_driver.h
index 9d864599107..ace7390a1de 100644
--- a/src/mongo/db/ops/update_driver.h
+++ b/src/mongo/db/ops/update_driver.h
@@ -69,11 +69,11 @@ namespace mongo {
          * conflicts along the way then those errors will be returned.
          */
         Status populateDocumentWithQueryFields(const BSONObj& query,
-                                               const vector<FieldRef*>* immutablePaths,
+                                               const std::vector<FieldRef*>* immutablePaths,
                                                mutablebson::Document& doc) const;
 
         Status populateDocumentWithQueryFields(const CanonicalQuery* query,
-                                               const vector<FieldRef*>* immutablePaths,
+                                               const std::vector<FieldRef*>* immutablePaths,
                                                mutablebson::Document& doc) const;
 
         /**
diff --git a/src/mongo/db/query/explain.h b/src/mongo/db/query/explain.h
index 888df375a03..79bd199cae6 100644
--- a/src/mongo/db/query/explain.h
+++ b/src/mongo/db/query/explain.h
@@ -167,7 +167,7 @@ namespace mongo {
          */
         static void generatePlannerInfo(PlanExecutor* exec,
                                         PlanStageStats* winnerStats,
-                                        const vector<PlanStageStats*>& rejectedStats,
+                                        const std::vector<PlanStageStats*>& rejectedStats,
                                         BSONObjBuilder* out);
 
         /**
diff --git a/src/mongo/db/query/get_executor.h b/src/mongo/db/query/get_executor.h
index f298851c3cf..cc20b42ab70 100644
--- a/src/mongo/db/query/get_executor.h
+++ b/src/mongo/db/query/get_executor.h
@@ -104,7 +104,7 @@ namespace mongo {
      * If the provided solution could be mutated successfully, returns true, otherwise returns
      * false.
      */
-    bool turnIxscanIntoDistinctIxscan(QuerySolution* soln, const string& field);
+    bool turnIxscanIntoDistinctIxscan(QuerySolution* soln, const std::string& field);
 
     /*
      * Get an executor for a query executing as part of a distinct command.
diff --git a/src/mongo/db/query/lite_parsed_query.h b/src/mongo/db/query/lite_parsed_query.h
index d2da40e6684..a16614f34ca 100644
--- a/src/mongo/db/query/lite_parsed_query.h
+++ b/src/mongo/db/query/lite_parsed_query.h
@@ -183,7 +183,7 @@ namespace mongo {
         int getSkip() const { return _skip; }
         int getLimit() const { return _limit; }
         int getBatchSize() const { return _batchSize; }
-        int getNumToReturn() const { return min(_limit, _batchSize); }
+        int getNumToReturn() const { return std::min(_limit, _batchSize); }
         bool wantMore() const { return _wantMore; }
         bool hasReadPref() const { return _options.hasReadPref; }
 
diff --git a/src/mongo/db/query/plan_enumerator.h b/src/mongo/db/query/plan_enumerator.h
index 1edd1d850a1..68e71991a2c 100644
--- a/src/mongo/db/query/plan_enumerator.h
+++ b/src/mongo/db/query/plan_enumerator.h
@@ -393,7 +393,7 @@ namespace mongo {
         void enumerateMandatoryIndex(const IndexToPredMap& idxToFirst,
                                      const IndexToPredMap& idxToNotFirst,
                                      MatchExpression* mandatoryPred,
-                                     const set<IndexID>& mandatoryIndices,
+                                     const std::set<IndexID>& mandatoryIndices,
                                      AndAssignment* andAssignment);
 
         /**
diff --git a/src/mongo/db/repl/replset_commands.h b/src/mongo/db/repl/replset_commands.h
index 0d05081418f..ff39e063da4 100644
--- a/src/mongo/db/repl/replset_commands.h
+++ b/src/mongo/db/repl/replset_commands.h
@@ -48,7 +48,7 @@ namespace repl {
         virtual bool slaveOk() const { return true; }
         virtual bool adminOnly() const { return true; }
         virtual bool isWriteCommandForConfigServer() const { return false; }
-        virtual void help( stringstream &help ) const { help << "internal"; }
+        virtual void help( std::stringstream &help ) const { help << "internal"; }
     };
 
 } // namespace repl
diff --git a/src/mongo/db/storage/mmap_v1/btree/btree_interface.h b/src/mongo/db/storage/mmap_v1/btree/btree_interface.h
index 2cc92060e0c..cb2cdd21125 100644
--- a/src/mongo/db/storage/mmap_v1/btree/btree_interface.h
+++ b/src/mongo/db/storage/mmap_v1/btree/btree_interface.h
@@ -45,6 +45,6 @@ namespace mongo {
                                             RecordStore* recordStore,
                                             SavedCursorRegistry* cursorRegistry,
                                             const Ordering& ordering,
-                                            const string& indexName,
+                                            const std::string& indexName,
                                             int version);
 }  // namespace mongo
diff --git a/src/mongo/db/storage/mmap_v1/btree/btree_logic.h b/src/mongo/db/storage/mmap_v1/btree/btree_logic.h
index c175b4efe0c..942f2b41365 100644
--- a/src/mongo/db/storage/mmap_v1/btree/btree_logic.h
+++ b/src/mongo/db/storage/mmap_v1/btree/btree_logic.h
@@ -79,7 +79,7 @@ namespace mongo {
                    RecordStore* store,
                    SavedCursorRegistry* cursors,
                    const Ordering& ordering,
-                   const string& indexName)
+                   const std::string& indexName)
             : _headManager(head),
               _recordStore(store),
               _cursorRegistry(cursors),
@@ -120,7 +120,7 @@ namespace mongo {
 
             DiskLoc _rightLeafLoc; // DiskLoc of right-most (highest) leaf bucket.
             bool _dupsAllowed;
-            auto_ptr<KeyDataOwnedType> _keyLast;
+            std::auto_ptr<KeyDataOwnedType> _keyLast;
 
             // Not owned.
             OperationContext* _txn;
@@ -199,8 +199,8 @@ namespace mongo {
                           const BSONObj& keyBegin,
                           int keyBeginLen,
                           bool afterKey,
-                          const vector<const BSONElement*>& keyEnd,
-                          const vector<bool>& keyEndInclusive,
+                          const std::vector<const BSONElement*>& keyEnd,
+                          const std::vector<bool>& keyEndInclusive,
                           int direction) const;
 
         void advanceTo(OperationContext*,
@@ -209,8 +209,8 @@ namespace mongo {
                        const BSONObj &keyBegin,
                        int keyBeginLen,
                        bool afterKey,
-                       const vector<const BSONElement*>& keyEnd,
-                       const vector<bool>& keyEndInclusive,
+                       const std::vector<const BSONElement*>& keyEnd,
+                       const std::vector<bool>& keyEndInclusive,
                        int direction) const;
 
         void restorePosition(OperationContext* txn,
@@ -351,10 +351,10 @@ namespace mongo {
                           const BSONObj& keyBegin,
                           int keyBeginLen,
                           bool afterKey,
-                          const vector<const BSONElement*>& keyEnd,
-                          const vector<bool>& keyEndInclusive,
+                          const std::vector<const BSONElement*>& keyEnd,
+                          const std::vector<bool>& keyEndInclusive,
                           int direction,
-                          pair<DiskLoc, int>& bestParent) const;
+                          std::pair<DiskLoc, int>& bestParent) const;
 
         Status _find(OperationContext* txn,
                      BucketType* bucket,
@@ -370,13 +370,13 @@ namespace mongo {
                         const BSONObj& keyBegin,
                         int keyBeginLen,
                         bool afterKey,
-                        const vector<const BSONElement*>& keyEnd,
-                        const vector<bool>& keyEndInclusive,
+                        const std::vector<const BSONElement*>& keyEnd,
+                        const std::vector<bool>& keyEndInclusive,
                         const Ordering& order,
                         int direction,
                         DiskLoc* thisLocInOut,
                         int* keyOfsInOut,
-                        pair<DiskLoc, int>& bestParent) const;
+                        std::pair<DiskLoc, int>& bestParent) const;
 
         void advanceToImpl(OperationContext* txn,
                            DiskLoc* thisLocInOut,
@@ -384,8 +384,8 @@ namespace mongo {
                            const BSONObj &keyBegin,
                            int keyBeginLen,
                            bool afterKey,
-                           const vector<const BSONElement*>& keyEnd,
-                           const vector<bool>& keyEndInclusive,
+                           const std::vector<const BSONElement*>& keyEnd,
+                           const std::vector<bool>& keyEndInclusive,
                            int direction) const;
 
         bool wouldCreateDup(OperationContext* txn,
@@ -597,7 +597,7 @@ namespace mongo {
 
         Ordering _ordering;
 
-        string _indexName;
+        std::string _indexName;
     };
 
 }  // namespace mongo
diff --git a/src/mongo/db/storage/mmap_v1/btree/btree_test_help.h b/src/mongo/db/storage/mmap_v1/btree/btree_test_help.h
index 5e5d0df250b..b282e72d827 100644
--- a/src/mongo/db/storage/mmap_v1/btree/btree_test_help.h
+++ b/src/mongo/db/storage/mmap_v1/btree/btree_test_help.h
@@ -145,7 +145,7 @@ namespace mongo {
 
         bool isPresent(const BSONObj& key, int direction) const;
 
-        static string expectedKey(const char* spec);
+        static std::string expectedKey(const char* spec);
 
         OperationContext* _txn;
         BtreeLogicTestHelper<OnDiskFormat>* _helper;
diff --git a/src/mongo/db/storage/mmap_v1/data_file_sync.h b/src/mongo/db/storage/mmap_v1/data_file_sync.h
index 07341a8bb92..a92f55b64f8 100644
--- a/src/mongo/db/storage/mmap_v1/data_file_sync.h
+++ b/src/mongo/db/storage/mmap_v1/data_file_sync.h
@@ -41,7 +41,7 @@ namespace mongo {
         DataFileSync();
 
         virtual bool includeByDefault() const { return true; }
-        virtual string name() const { return "DataFileSync"; }
+        virtual std::string name() const { return "DataFileSync"; }
 
         void run();
 
diff --git a/src/mongo/db/storage/mmap_v1/extent.h b/src/mongo/db/storage/mmap_v1/extent.h
index e8ede6fe559..a25d34c49e0 100644
--- a/src/mongo/db/storage/mmap_v1/extent.h
+++ b/src/mongo/db/storage/mmap_v1/extent.h
@@ -71,7 +71,7 @@ namespace mongo {
 
         BSONObj dump() const;
 
-        void dump(iostream& s) const;
+        void dump(std::iostream& s) const;
 
         bool isOk() const { return magic == extentSignature; }
         void assertOk() const { verify(isOk()); }
diff --git a/src/mongo/db/storage/record_store_test_docwriter.h b/src/mongo/db/storage/record_store_test_docwriter.h
index 14e741c48d8..e026e942f9b 100644
--- a/src/mongo/db/storage/record_store_test_docwriter.h
+++ b/src/mongo/db/storage/record_store_test_docwriter.h
@@ -39,7 +39,7 @@ namespace {
 
     class StringDocWriter : public DocWriter {
     public:
-        StringDocWriter( const string &data, bool padding )
+        StringDocWriter( const std::string &data, bool padding )
             : _data( data ), _padding( padding ) {
         }
 
@@ -54,7 +54,7 @@ namespace {
         bool addPadding() const { return _padding; }
 
     private:
-        string _data;
+        std::string _data;
         bool _padding;
     };
 
diff --git a/src/mongo/db/storage/record_store_test_updaterecord.h b/src/mongo/db/storage/record_store_test_updaterecord.h
index 479ac9f7748..4ff21ae0e1c 100644
--- a/src/mongo/db/storage/record_store_test_updaterecord.h
+++ b/src/mongo/db/storage/record_store_test_updaterecord.h
@@ -65,7 +65,7 @@ namespace {
     private:
         OperationContext *_txn;
         RecordId _loc;
-        string _data;
+        std::string _data;
 
         int nCalls; // to verify that recordStoreGoingToMove() gets called once
     };
diff --git a/src/mongo/db/storage/record_store_test_validate.h b/src/mongo/db/storage/record_store_test_validate.h
index d403800dc84..6682649f5da 100644
--- a/src/mongo/db/storage/record_store_test_validate.h
+++ b/src/mongo/db/storage/record_store_test_validate.h
@@ -48,14 +48,14 @@ namespace {
     public:
         ValidateAdaptorSpy() { }
 
-        ValidateAdaptorSpy( const set<string> &remain )
+        ValidateAdaptorSpy( const std::set<std::string> &remain )
             : _remain( remain ) {
         }
 
         ~ValidateAdaptorSpy() { }
 
         Status validate( const RecordData &recordData, size_t *dataSize ) {
-            string s( recordData.data() );
+            std::string s( recordData.data() );
             ASSERT( 1 == _remain.erase( s ) );
 
             *dataSize = recordData.size();
@@ -65,7 +65,7 @@ namespace {
         bool allValidated() { return _remain.empty(); }
 
     private:
-        set<string> _remain; // initially contains all inserted records
+        std::set<std::string> _remain; // initially contains all inserted records
     };
 
     class ValidateTest : public mongo::unittest::Test {
@@ -81,7 +81,7 @@ namespace {
 
         RecordStore& getRecordStore() { return *_rs; }
 
-        const set<string>& getInsertedRecords() { return _remain; }
+        const std::set<std::string>& getInsertedRecords() { return _remain; }
 
         void setUp() {
             {
@@ -93,9 +93,9 @@ namespace {
             for ( int i = 0; i < nToInsert; i++ ) {
                 boost::scoped_ptr<OperationContext> opCtx( newOperationContext() );
                 {
-                    stringstream ss;
+                    std::stringstream ss;
                     ss << "record " << i;
-                    string data = ss.str();
+                    std::string data = ss.str();
                     ASSERT( _remain.insert( data ).second );
 
                     WriteUnitOfWork uow( opCtx.get() );
@@ -117,7 +117,7 @@ namespace {
     private:
         boost::scoped_ptr<HarnessHelper> _harnessHelper;
         boost::scoped_ptr<RecordStore> _rs;
-        set<string> _remain;
+        std::set<std::string> _remain;
     };
 
 } // namespace
diff --git a/src/mongo/db/storage/rocks/rocks_record_store.h b/src/mongo/db/storage/rocks/rocks_record_store.h
index ebf06ee0ca0..ca7ad11eb3b 100644
--- a/src/mongo/db/storage/rocks/rocks_record_store.h
+++ b/src/mongo/db/storage/rocks/rocks_record_store.h
@@ -263,7 +263,7 @@ namespace mongo {
         std::atomic<long long> _dataSize;
         std::atomic<long long> _numRecords;
 
-        const string _dataSizeKey;
-        const string _numRecordsKey;
+        const std::string _dataSizeKey;
+        const std::string _numRecordsKey;
     };
 }
diff --git a/src/mongo/db/storage/sorted_data_interface.h b/src/mongo/db/storage/sorted_data_interface.h
index 69fda5671a4..98bac8e5136 100644
--- a/src/mongo/db/storage/sorted_data_interface.h
+++ b/src/mongo/db/storage/sorted_data_interface.h
@@ -233,8 +233,8 @@ namespace mongo {
             virtual void advanceTo(const BSONObj &keyPrefix,
                                    int prefixLen,
                                    bool prefixExclusive,
-                                   const vector<const BSONElement*>& keySuffix,
-                                   const vector<bool>& suffixInclusive) = 0;
+                                   const std::vector<const BSONElement*>& keySuffix,
+                                   const std::vector<bool>& suffixInclusive) = 0;
 
             /**
              * Position 'this' forward (reverse) cursor either at the first
@@ -286,8 +286,8 @@ namespace mongo {
             virtual void customLocate(const BSONObj& keyPrefix,
                                       int prefixLen,
                                       bool prefixExclusive,
-                                      const vector<const BSONElement*>& keySuffix,
-                                      const vector<bool>& suffixInclusive) = 0;
+                                      const std::vector<const BSONElement*>& keySuffix,
+                                      const std::vector<bool>& suffixInclusive) = 0;
 
             /**
              * Return the key associated with the current position of 'this' cursor.
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h
index 4d2e0561aba..845d226478a 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h
@@ -125,7 +125,7 @@ namespace mongo {
 
         bool _hasUri(WT_SESSION* session, const std::string& uri) const;
 
-        string _uri( const StringData& ident ) const;
+        std::string _uri( const StringData& ident ) const;
         bool _drop( const StringData& ident );
 
         WT_CONNECTION* _conn;
@@ -134,14 +134,14 @@ namespace mongo {
         std::string _path;
         bool _durable;
 
-        string _rsOptions;
-        string _indexOptions;
+        std::string _rsOptions;
+        std::string _indexOptions;
 
         std::set<std::string> _identToDrop;
         mutable boost::mutex _identToDropMutex;
 
         boost::scoped_ptr<WiredTigerSizeStorer> _sizeStorer;
-        string _sizeStorerUri;
+        std::string _sizeStorerUri;
         mutable ElapsedTracker _sizeStorerSyncTracker;
     };
 
diff --git a/src/mongo/dbtests/querytests.cpp b/src/mongo/dbtests/querytests.cpp
index 9b3532b801a..80bb6c6f3b0 100644
--- a/src/mongo/dbtests/querytests.cpp
+++ b/src/mongo/dbtests/querytests.cpp
@@ -49,7 +49,7 @@
 #include "mongo/util/timer.h"
 
 namespace mongo {
-    void assembleRequest( const string &ns, BSONObj query, int nToReturn, int nToSkip,
+    void assembleRequest( const std::string &ns, BSONObj query, int nToReturn, int nToSkip,
                          const BSONObj *fieldsToReturn, int queryOptions, Message &toSend );
 }
 
diff --git a/src/mongo/s/chunk_manager_targeter.h b/src/mongo/s/chunk_manager_targeter.h
index 75fb8500d4b..b082ad62eec 100644
--- a/src/mongo/s/chunk_manager_targeter.h
+++ b/src/mongo/s/chunk_manager_targeter.h
@@ -121,7 +121,7 @@ namespace mongo {
          *
          * Returns !OK with message if replacement could not be targeted
          */
-        Status targetDoc(const BSONObj& doc, vector<ShardEndpoint*>* endpoints) const;
+        Status targetDoc(const BSONObj& doc, std::vector<ShardEndpoint*>* endpoints) const;
 
         /**
          * Returns a vector of ShardEndpoints for a potentially multi-shard query.
diff --git a/src/mongo/s/cluster_explain.h b/src/mongo/s/cluster_explain.h
index 28f6207aa30..ef86af7f76f 100644
--- a/src/mongo/s/cluster_explain.h
+++ b/src/mongo/s/cluster_explain.h
@@ -58,7 +58,7 @@ namespace mongo {
          * the results from the shards, assuming that the command being explained is a read
          * operation such as find or count.
          */
-        static const char* getStageNameForReadOp(const vector<Strategy::CommandResult>& shardResults,
+        static const char* getStageNameForReadOp(const std::vector<Strategy::CommandResult>& shardResults,
                                                  const BSONObj& explainObj);
 
         /**
@@ -67,7 +67,7 @@ namespace mongo {
          *
          * On success, the output is added to the BSONObj builder 'out'.
          */
-        static Status buildExplainResult(const vector<Strategy::CommandResult>& shardResults,
+        static Status buildExplainResult(const std::vector<Strategy::CommandResult>& shardResults,
                                          const char* mongosStageName,
                                          long long millisElapsed,
                                          BSONObjBuilder* out);
@@ -86,7 +86,7 @@ namespace mongo {
          * Returns an OK status if all shards support the explain command and returned sensible
          * results. Otherwise, returns a non-OK status and the entire explain should fail.
          */
-        static Status validateShardResults(const vector<Strategy::CommandResult>& shardResults);
+        static Status validateShardResults(const std::vector<Strategy::CommandResult>& shardResults);
 
         /**
          * Populates the BSONObj builder 'out' with query planner explain information, based on
@@ -95,7 +95,7 @@ namespace mongo {
          * The planner info will display 'mongosStageName' as the name of the execution stage
          * performed by mongos after gathering results from the shards.
          */
-        static void buildPlannerInfo(const vector<Strategy::CommandResult>& shardResults,
+        static void buildPlannerInfo(const std::vector<Strategy::CommandResult>& shardResults,
                                      const char* mongosStageName,
                                      BSONObjBuilder* out);
 
@@ -106,7 +106,7 @@ namespace mongo {
          * Will display 'mongosStageName' as the name of the execution stage performed by mongos,
          * and 'millisElapsed' as the execution time of the mongos stage.
          */
-        static void buildExecStats(const vector<Strategy::CommandResult>& shardResults,
+        static void buildExecStats(const std::vector<Strategy::CommandResult>& shardResults,
                                    const char* mongosStageName,
                                    long long millisElapsed,
                                    BSONObjBuilder* out);
diff --git a/src/mongo/s/commands/cluster_explain_cmd.h b/src/mongo/s/commands/cluster_explain_cmd.h
index 090bfd668f0..f7388cd1188 100644
--- a/src/mongo/s/commands/cluster_explain_cmd.h
+++ b/src/mongo/s/commands/cluster_explain_cmd.h
@@ -61,7 +61,7 @@ namespace mongo {
 
         virtual bool adminOnly() const { return false; }
 
-        virtual void help( stringstream& help ) const {
+        virtual void help( std::stringstream& help ) const {
             help << "explain database reads and writes";
         }
 
@@ -74,10 +74,10 @@ namespace mongo {
                                            const std::string& dbname,
                                            const BSONObj& cmdObj);
 
-        virtual bool run(OperationContext* txn, const string& dbName,
+        virtual bool run(OperationContext* txn, const std::string& dbName,
                          BSONObj& cmdObj,
                          int options,
-                         string& errmsg,
+                         std::string& errmsg,
                          BSONObjBuilder& result,
                          bool fromRepl);
 
diff --git a/src/mongo/s/commands/cluster_find_cmd.h b/src/mongo/s/commands/cluster_find_cmd.h
index cfb878f6e2b..c62dd402907 100644
--- a/src/mongo/s/commands/cluster_find_cmd.h
+++ b/src/mongo/s/commands/cluster_find_cmd.h
@@ -52,7 +52,7 @@ namespace mongo {
 
         virtual bool adminOnly() const { return false; }
 
-        virtual void help(stringstream& help) const {
+        virtual void help(std::stringstream& help) const {
             help << "query for documents";
         }
 
@@ -71,9 +71,9 @@ namespace mongo {
                                BSONObjBuilder* out) const;
 
         virtual bool run(OperationContext* txn,
-                         const string& dbname,
+                         const std::string& dbname,
                          BSONObj& cmdObj, int options,
-                         string& errmsg,
+                         std::string& errmsg,
                          BSONObjBuilder& result,
                          bool fromRepl);
 
diff --git a/src/mongo/s/grid.h b/src/mongo/s/grid.h
index 672072170dd..7bebf85c58d 100644
--- a/src/mongo/s/grid.h
+++ b/src/mongo/s/grid.h
@@ -119,7 +119,7 @@ namespace mongo {
          * exist, it is not considered as an error, but the "key" property of the settings
          * output parameter will not be set.
          */
-        bool getBalancerSettings(SettingsType* settings, string* errMsg) const;
+        bool getBalancerSettings(SettingsType* settings, std::string* errMsg) const;
 
         /**
          * Returns true if the config server settings indicate that the balancer should be active.
diff --git a/src/mongo/s/scc_fast_query_handler.h b/src/mongo/s/scc_fast_query_handler.h
index 76c81dab6c8..22875f6b9db 100644
--- a/src/mongo/s/scc_fast_query_handler.h
+++ b/src/mongo/s/scc_fast_query_handler.h
@@ -54,16 +54,16 @@ namespace mongo {
         virtual ~SCCFastQueryHandler() {
         }
 
-        virtual bool canHandleQuery(const string& ns, Query query);
+        virtual bool canHandleQuery(const std::string& ns, Query query);
 
-        virtual auto_ptr<DBClientCursor> handleQuery(const vector<string>& hostStrings,
-                                                     const string &ns,
-                                                     Query query,
-                                                     int nToReturn,
-                                                     int nToSkip,
-                                                     const BSONObj *fieldsToReturn,
-                                                     int queryOptions,
-                                                     int batchSize);
+        virtual std::auto_ptr<DBClientCursor> handleQuery(const std::vector<std::string>& hostStrings,
+                                                          const std::string &ns,
+                                                          Query query,
+                                                          int nToReturn,
+                                                          int nToSkip,
+                                                          const BSONObj *fieldsToReturn,
+                                                          int queryOptions,
+                                                          int batchSize);
 
     private:
 
diff --git a/src/mongo/scripting/bson_template_evaluator.h b/src/mongo/scripting/bson_template_evaluator.h
index c43f18e58c1..d5fe8353524 100644
--- a/src/mongo/scripting/bson_template_evaluator.h
+++ b/src/mongo/scripting/bson_template_evaluator.h
@@ -137,7 +137,7 @@ namespace mongo {
         OperatorMap _operatorFunctions;
 
         // map that holds variable name and value pairs
-        typedef std::map<string, BSONObj> VarMap;
+        typedef std::map<std::string, BSONObj> VarMap;
         VarMap _varMap;
 
         // evaluates a BSON element. This is internally called by the top level evaluate method.
diff --git a/src/mongo/scripting/engine_v8-3.25.h b/src/mongo/scripting/engine_v8-3.25.h
index c78d8b97b35..680e0e125f4 100644
--- a/src/mongo/scripting/engine_v8-3.25.h
+++ b/src/mongo/scripting/engine_v8-3.25.h
@@ -198,7 +198,7 @@ namespace mongo {
 
         virtual void installBSONTypes();
 
-        virtual string getError() { return _error; }
+        virtual std::string getError() { return _error; }
 
         virtual bool hasOutOfMemoryException();
 
@@ -216,7 +216,7 @@ namespace mongo {
         virtual double getNumber(const char* field);
         virtual int getNumberInt(const char* field);
         virtual long long getNumberLongLong(const char* field);
-        virtual string getString(const char* field);
+        virtual std::string getString(const char* field);
         virtual bool getBoolean(const char* field);
         virtual BSONObj getObject(const char* field);
 
@@ -235,7 +235,7 @@ namespace mongo {
                            int timeoutMs = 0, bool ignoreReturn = false,
                            bool readOnlyArgs = false, bool readOnlyRecv = false);
 
-        virtual bool exec(const StringData& code, const string& name, bool printResult,
+        virtual bool exec(const StringData& code, const std::string& name, bool printResult,
                           bool reportError, bool assertOnError, int timeoutMs);
 
         // functions to create v8 object and function templates
@@ -457,7 +457,7 @@ namespace mongo {
 
         v8::Eternal<v8::Context> _context;
         v8::Eternal<v8::Object> _global;
-        string _error;
+        std::string _error;
         std::vector<v8::Eternal<v8::Value> > _funcs;
 
         enum ConnectState { NOT, LOCAL, EXTERNAL };
@@ -562,7 +562,7 @@ namespace mongo {
          */
         DeadlineMonitor<V8Scope>* getDeadlineMonitor() { return &_deadlineMonitor; }
 
-        typedef map<unsigned, V8Scope*> OpIdToScopeMap;
+        typedef std::map<unsigned, V8Scope*> OpIdToScopeMap;
         mongo::mutex _globalInterruptLock;  // protects map of all operation ids -> scope
         OpIdToScopeMap _opToScopeMap;       // map of mongo op ids to scopes (protected by
                                             // _globalInterruptLock).
diff --git a/src/mongo/scripting/v8_deadline_monitor.h b/src/mongo/scripting/v8_deadline_monitor.h
index d3abfb27266..45913e65b48 100644
--- a/src/mongo/scripting/v8_deadline_monitor.h
+++ b/src/mongo/scripting/v8_deadline_monitor.h
@@ -92,7 +92,7 @@ namespace mongo {
 
             // insert or update the deadline
             std::pair<typename TaskDeadlineMap::iterator, bool> inserted =
-                    _tasks.insert(make_pair(task, now + timeoutMs));
+                _tasks.insert(std::make_pair(task, now + timeoutMs));
 
             if (!inserted.second)
                 inserted.first->second = now + timeoutMs;
diff --git a/src/mongo/unittest/unittest.h b/src/mongo/unittest/unittest.h
index acfda1c1cb7..e71e3f95fb4 100644
--- a/src/mongo/unittest/unittest.h
+++ b/src/mongo/unittest/unittest.h
@@ -159,7 +159,7 @@
         if ( myString.find(CONTAINS) == std::string::npos ) {           \
             std::string err( "Expected " #BIG_STRING " (" );            \
             err += myString;                                            \
-            err += string(") to contain " #CONTAINS );                  \
+            err += std::string(") to contain " #CONTAINS );             \
             ::mongo::unittest::TestAssertionFailure(__FILE__,           \
                                                     __LINE__,           \
                                                     err).stream();      \
diff --git a/src/mongo/util/bson_util.h b/src/mongo/util/bson_util.h
index b198f5a2798..db873bdfd45 100644
--- a/src/mongo/util/bson_util.h
+++ b/src/mongo/util/bson_util.h
@@ -41,7 +41,7 @@ void bsonArrToNumVector(BSONElement el, std::vector<T>& results){
 
     if(el.type() == Array){
 
-	vector<BSONElement> elements = el.Array();
+        std::vector<BSONElement> elements = el.Array();
 
         for(std::vector<BSONElement>::iterator i = elements.begin(); i != elements.end(); ++i){
             results.push_back( (T) (*i).Number() );