summaryrefslogtreecommitdiff
path: root/src/mongo/db/ops
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2015-01-09 18:02:51 -0500
committerAndrew Morrow <acm@mongodb.com>2015-01-15 07:04:26 -0500
commit9f30e21c627e4c73ab0b44e45b7ce657b3e2619f (patch)
tree4863e66baca59d2733c4d8090ed962ef60908d6a /src/mongo/db/ops
parent44cafa7dddde7510aa0a05efce807a2e294fdc6d (diff)
downloadmongo-9f30e21c627e4c73ab0b44e45b7ce657b3e2619f.tar.gz
SERVER-13256 Add usings and qualifications for names from namespace std
Diffstat (limited to 'src/mongo/db/ops')
-rw-r--r--src/mongo/db/ops/insert.cpp2
-rw-r--r--src/mongo/db/ops/modifier_pull_all.cpp2
-rw-r--r--src/mongo/db/ops/modifier_push.cpp3
-rw-r--r--src/mongo/db/ops/modifier_table.cpp4
-rw-r--r--src/mongo/db/ops/path_support.cpp3
-rw-r--r--src/mongo/db/ops/path_support_test.cpp1
-rw-r--r--src/mongo/db/ops/update_driver.cpp3
7 files changed, 17 insertions, 1 deletions
diff --git a/src/mongo/db/ops/insert.cpp b/src/mongo/db/ops/insert.cpp
index 22613fdaf04..131ebbc67b7 100644
--- a/src/mongo/db/ops/insert.cpp
+++ b/src/mongo/db/ops/insert.cpp
@@ -34,6 +34,8 @@
namespace mongo {
+ using std::string;
+
using namespace mongoutils;
StatusWith<BSONObj> fixDocumentForInsert( const BSONObj& doc ) {
diff --git a/src/mongo/db/ops/modifier_pull_all.cpp b/src/mongo/db/ops/modifier_pull_all.cpp
index 2a3cbb855eb..af595d6cd74 100644
--- a/src/mongo/db/ops/modifier_pull_all.cpp
+++ b/src/mongo/db/ops/modifier_pull_all.cpp
@@ -38,6 +38,8 @@
namespace mongo {
+ using std::vector;
+
namespace mb = mutablebson;
namespace str = mongoutils::str;
diff --git a/src/mongo/db/ops/modifier_push.cpp b/src/mongo/db/ops/modifier_push.cpp
index f7b4d2285be..68b3ae82cff 100644
--- a/src/mongo/db/ops/modifier_push.cpp
+++ b/src/mongo/db/ops/modifier_push.cpp
@@ -44,6 +44,9 @@
namespace mongo {
+ using std::abs;
+ using std::numeric_limits;
+
namespace mb = mutablebson;
namespace str = mongoutils::str;
diff --git a/src/mongo/db/ops/modifier_table.cpp b/src/mongo/db/ops/modifier_table.cpp
index 31d4095160a..2f4f2bd418d 100644
--- a/src/mongo/db/ops/modifier_table.cpp
+++ b/src/mongo/db/ops/modifier_table.cpp
@@ -48,6 +48,10 @@
#include "mongo/platform/unordered_map.h"
namespace mongo {
+
+ using std::make_pair;
+ using std::string;
+
namespace modifiertable {
namespace {
diff --git a/src/mongo/db/ops/path_support.cpp b/src/mongo/db/ops/path_support.cpp
index fa72a4aceae..857a54c4b52 100644
--- a/src/mongo/db/ops/path_support.cpp
+++ b/src/mongo/db/ops/path_support.cpp
@@ -38,6 +38,7 @@
namespace mongo {
namespace pathsupport {
+ using std::string;
using mongoutils::str::stream;
namespace {
@@ -414,7 +415,7 @@ namespace pathsupport {
if (!status.isOK())
return status;
- equalities->insert(make_pair(eqChild.path(), &eqChild));
+ equalities->insert(std::make_pair(eqChild.path(), &eqChild));
}
else if (root.matchType() == MatchExpression::AND) {
diff --git a/src/mongo/db/ops/path_support_test.cpp b/src/mongo/db/ops/path_support_test.cpp
index 686d4b46094..f65cebabf6d 100644
--- a/src/mongo/db/ops/path_support_test.cpp
+++ b/src/mongo/db/ops/path_support_test.cpp
@@ -53,6 +53,7 @@ namespace {
using namespace mutablebson;
using namespace pathsupport;
using mongoutils::str::stream;
+ using std::auto_ptr;
using std::string;
class EmptyDoc : public mongo::unittest::Test {
diff --git a/src/mongo/db/ops/update_driver.cpp b/src/mongo/db/ops/update_driver.cpp
index d23a91a38f9..20a25d9c792 100644
--- a/src/mongo/db/ops/update_driver.cpp
+++ b/src/mongo/db/ops/update_driver.cpp
@@ -49,6 +49,9 @@ namespace mongo {
namespace mb = mongo::mutablebson;
using boost::scoped_ptr;
+ using std::auto_ptr;
+ using std::vector;
+
using pathsupport::EqualityMatches;
UpdateDriver::UpdateDriver(const Options& opts)