SERVER-13256 Add usings and qualifications for names from namespace std

23 files changed, 63 insertions, 0 deletions

diff --git a/src/mongo/db/query/canonical_query_test.cpp b/src/mongo/db/query/canonical_query_test.cpp
index 73127fbd34f..af3f705ca05 100644
--- a/src/mongo/db/query/canonical_query_test.cpp
+++ b/src/mongo/db/query/canonical_query_test.cpp
@@ -35,6 +35,9 @@ using namespace mongo;
 
 namespace {
 
+    using std::auto_ptr;
+    using std::string;
+
     static const char* ns = "somebogusns";
 
     /**
diff --git a/src/mongo/db/query/explain.cpp b/src/mongo/db/query/explain.cpp
index ecce742a307..40b091cdc87 100644
--- a/src/mongo/db/query/explain.cpp
+++ b/src/mongo/db/query/explain.cpp
@@ -49,6 +49,9 @@ namespace {
 
     using namespace mongo;
     using boost::scoped_ptr;
+    using std::auto_ptr;
+    using std::string;
+    using std::vector;
 
     /**
      * Traverse the tree rooted at 'root', and add all tree nodes into the list 'flattened'.
diff --git a/src/mongo/db/query/expression_index.cpp b/src/mongo/db/query/expression_index.cpp
index 13cd25e07b0..51cc439da23 100644
--- a/src/mongo/db/query/expression_index.cpp
+++ b/src/mongo/db/query/expression_index.cpp
@@ -39,6 +39,8 @@
 
 namespace mongo {
 
+    using std::set;
+
     BSONObj ExpressionMapping::hash(const BSONElement& value) {
         BSONObjBuilder bob;
         bob.append("", BSONElementHasher::hash64(value, BSONElementHasher::DEFAULT_HASH_SEED));
diff --git a/src/mongo/db/query/find.cpp b/src/mongo/db/query/find.cpp
index 74e58268b68..7e176e2c7f5 100644
--- a/src/mongo/db/query/find.cpp
+++ b/src/mongo/db/query/find.cpp
@@ -63,6 +63,8 @@
 #include "mongo/util/mongoutils/str.h"
 
 using boost::scoped_ptr;
+using std::auto_ptr;
+using std::endl;
 
 namespace mongo {
     // The .h for this in find_constants.h.
diff --git a/src/mongo/db/query/get_executor.cpp b/src/mongo/db/query/get_executor.cpp
index 7e3b6087998..32fe3525c75 100644
--- a/src/mongo/db/query/get_executor.cpp
+++ b/src/mongo/db/query/get_executor.cpp
@@ -74,6 +74,11 @@
 
 namespace mongo {
 
+    using std::auto_ptr;
+    using std::endl;
+    using std::string;
+    using std::vector;
+
     // static
     void filterAllowedIndexEntries(const AllowedIndices& allowedIndices,
                                    std::vector<IndexEntry>* indexEntries) {
diff --git a/src/mongo/db/query/index_bounds.cpp b/src/mongo/db/query/index_bounds.cpp
index 664b2245613..b88bbe67f42 100644
--- a/src/mongo/db/query/index_bounds.cpp
+++ b/src/mongo/db/query/index_bounds.cpp
@@ -33,6 +33,7 @@
 
 namespace mongo {
 
+    using std::string;
     using std::vector;
 
     namespace {
diff --git a/src/mongo/db/query/index_bounds_builder_test.cpp b/src/mongo/db/query/index_bounds_builder_test.cpp
index 92231ba7a32..accf74f06fa 100644
--- a/src/mongo/db/query/index_bounds_builder_test.cpp
+++ b/src/mongo/db/query/index_bounds_builder_test.cpp
@@ -43,6 +43,9 @@ using namespace mongo;
 namespace {
 
     using std::auto_ptr;
+    using std::numeric_limits;
+    using std::string;
+    using std::vector;
 
     double numberMin = -numeric_limits<double>::max();
     double numberMax = numeric_limits<double>::max();
diff --git a/src/mongo/db/query/interval.cpp b/src/mongo/db/query/interval.cpp
index c42feefa2c2..cdbb7abbb6d 100644
--- a/src/mongo/db/query/interval.cpp
+++ b/src/mongo/db/query/interval.cpp
@@ -30,6 +30,8 @@
 
 namespace mongo {
 
+    using std::string;
+
     Interval::Interval()
         : _intervalData(BSONObj()), start(BSONElement()), startInclusive(false), end(BSONElement()),
           endInclusive(false) { }
diff --git a/src/mongo/db/query/lite_parsed_query.cpp b/src/mongo/db/query/lite_parsed_query.cpp
index d002850122b..dae741b59c1 100644
--- a/src/mongo/db/query/lite_parsed_query.cpp
+++ b/src/mongo/db/query/lite_parsed_query.cpp
@@ -36,6 +36,9 @@
 
 namespace mongo {
 
+    using std::auto_ptr;
+    using std::string;
+
     const string LiteParsedQuery::cmdOptionMaxTimeMS("maxTimeMS");
     const string LiteParsedQuery::queryOptionMaxTimeMS("$maxTimeMS");
 
diff --git a/src/mongo/db/query/parsed_projection.cpp b/src/mongo/db/query/parsed_projection.cpp
index 0fa92ed8951..c18ddd4135e 100644
--- a/src/mongo/db/query/parsed_projection.cpp
+++ b/src/mongo/db/query/parsed_projection.cpp
@@ -32,6 +32,9 @@
 
 namespace mongo {
 
+    using std::auto_ptr;
+    using std::string;
+
     /**
      * Parses the projection 'spec' and checks its validity with respect to the query 'query'.
      * Puts covering information into 'out'.
diff --git a/src/mongo/db/query/plan_cache.cpp b/src/mongo/db/query/plan_cache.cpp
index bc3fff29458..d1b16dc209c 100644
--- a/src/mongo/db/query/plan_cache.cpp
+++ b/src/mongo/db/query/plan_cache.cpp
@@ -47,6 +47,9 @@
 
 namespace mongo {
 
+    using std::string;
+    using std::vector;
+
     //
     // Cache-related functions for CanonicalQuery
     //
diff --git a/src/mongo/db/query/plan_cache_test.cpp b/src/mongo/db/query/plan_cache_test.cpp
index 19b44fd46a5..e10f112134a 100644
--- a/src/mongo/db/query/plan_cache_test.cpp
+++ b/src/mongo/db/query/plan_cache_test.cpp
@@ -54,6 +54,8 @@ namespace {
 
     using boost::scoped_ptr;
     using std::auto_ptr;
+    using std::string;
+    using std::vector;
 
     static const char* ns = "somebogusns";
 
diff --git a/src/mongo/db/query/plan_enumerator.cpp b/src/mongo/db/query/plan_enumerator.cpp
index ae485a7386f..7f60f5d1eaf 100644
--- a/src/mongo/db/query/plan_enumerator.cpp
+++ b/src/mongo/db/query/plan_enumerator.cpp
@@ -40,6 +40,11 @@
 namespace {
 
     using namespace mongo;
+    using std::auto_ptr;
+    using std::endl;
+    using std::set;
+    using std::string;
+    using std::vector;
 
     std::string getPathPrefix(std::string path) {
         if (mongoutils::str::contains(path, '.')) {
diff --git a/src/mongo/db/query/plan_executor.cpp b/src/mongo/db/query/plan_executor.cpp
index 2a9e1009aad..cb1c5fcb19e 100644
--- a/src/mongo/db/query/plan_executor.cpp
+++ b/src/mongo/db/query/plan_executor.cpp
@@ -47,6 +47,8 @@
 namespace mongo {
 
     using boost::shared_ptr;
+    using std::string;
+    using std::vector;
 
     namespace {
 
diff --git a/src/mongo/db/query/plan_ranker.cpp b/src/mongo/db/query/plan_ranker.cpp
index 12c9bfef5b7..54075c2f16a 100644
--- a/src/mongo/db/query/plan_ranker.cpp
+++ b/src/mongo/db/query/plan_ranker.cpp
@@ -63,6 +63,7 @@ namespace {
 
 namespace mongo {
 
+    using std::endl;
     using std::vector;
 
     // static 
diff --git a/src/mongo/db/query/planner_access.cpp b/src/mongo/db/query/planner_access.cpp
index 0e73da652cf..bb79362aad3 100644
--- a/src/mongo/db/query/planner_access.cpp
+++ b/src/mongo/db/query/planner_access.cpp
@@ -60,6 +60,7 @@ namespace {
 
 namespace mongo {
 
+    using std::auto_ptr;
     using std::vector;
 
     // static
diff --git a/src/mongo/db/query/planner_analysis.cpp b/src/mongo/db/query/planner_analysis.cpp
index a1ba92b8c70..24f5af7279b 100644
--- a/src/mongo/db/query/planner_analysis.cpp
+++ b/src/mongo/db/query/planner_analysis.cpp
@@ -37,6 +37,11 @@
 
 namespace mongo {
 
+    using std::auto_ptr;
+    using std::endl;
+    using std::string;
+    using std::vector;
+
     //
     // Helpers for bounds explosion AKA quick-and-dirty SERVER-1205.
     //
diff --git a/src/mongo/db/query/query_planner.cpp b/src/mongo/db/query/query_planner.cpp
index 8f5880ab467..324cdbd07dd 100644
--- a/src/mongo/db/query/query_planner.cpp
+++ b/src/mongo/db/query/query_planner.cpp
@@ -50,6 +50,9 @@
 
 namespace mongo {
 
+    using std::auto_ptr;
+    using std::numeric_limits;
+
     // Copied verbatim from db/index.h
     static bool isIdIndex( const BSONObj &pattern ) {
         BSONObjIterator i(pattern);
diff --git a/src/mongo/db/query/query_planner_test.cpp b/src/mongo/db/query/query_planner_test.cpp
index cb493541032..5f67c114a99 100644
--- a/src/mongo/db/query/query_planner_test.cpp
+++ b/src/mongo/db/query/query_planner_test.cpp
@@ -49,6 +49,10 @@ using namespace mongo;
 
 namespace {
 
+    using std::map;
+    using std::string;
+    using std::vector;
+
     static const char* ns = "somebogusns";
 
     class QueryPlannerTest : public mongo::unittest::Test {
diff --git a/src/mongo/db/query/query_planner_test_lib.cpp b/src/mongo/db/query/query_planner_test_lib.cpp
index a95f406721e..cf315f2908a 100644
--- a/src/mongo/db/query/query_planner_test_lib.cpp
+++ b/src/mongo/db/query/query_planner_test_lib.cpp
@@ -46,6 +46,8 @@ namespace {
 
     using namespace mongo;
 
+    using std::string;
+
     bool filterMatches(const BSONObj& testFilter,
                        const QuerySolutionNode* trueFilterNode) {
         if (NULL == trueFilterNode->filter) { return false; }
diff --git a/src/mongo/db/query/query_planner_text_test.cpp b/src/mongo/db/query/query_planner_text_test.cpp
index 422163fb72a..f88f9bb16dc 100644
--- a/src/mongo/db/query/query_planner_text_test.cpp
+++ b/src/mongo/db/query/query_planner_text_test.cpp
@@ -44,6 +44,10 @@
 #include "mongo/util/assert_util.h"
 
 using namespace mongo;
+using std::cout;
+using std::endl;
+using std::string;
+using std::vector;
 
 namespace {
 
diff --git a/src/mongo/db/query/query_solution.cpp b/src/mongo/db/query/query_solution.cpp
index 7b11ade8dbc..877e58612c3 100644
--- a/src/mongo/db/query/query_solution.cpp
+++ b/src/mongo/db/query/query_solution.cpp
@@ -35,6 +35,8 @@
 
 namespace mongo {
 
+    using std::set;
+
     string QuerySolutionNode::toString() const {
         mongoutils::str::stream ss;
         appendToString(&ss, 0);
diff --git a/src/mongo/db/query/stage_builder.cpp b/src/mongo/db/query/stage_builder.cpp
index 549a8f461d9..097b4f71e61 100644
--- a/src/mongo/db/query/stage_builder.cpp
+++ b/src/mongo/db/query/stage_builder.cpp
@@ -55,6 +55,8 @@
 
 namespace mongo {
 
+    using std::auto_ptr;
+
     PlanStage* buildStages(OperationContext* txn,
                            Collection* collection,
                            const QuerySolution& qsol,