summaryrefslogtreecommitdiff
path: root/src/mongo/base
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/base
parent44cafa7dddde7510aa0a05efce807a2e294fdc6d (diff)
downloadmongo-9f30e21c627e4c73ab0b44e45b7ce657b3e2619f.tar.gz
SERVER-13256 Add usings and qualifications for names from namespace std
Diffstat (limited to 'src/mongo/base')
-rw-r--r--src/mongo/base/owned_pointer_map_test.cpp1
-rw-r--r--src/mongo/base/owned_pointer_vector_test.cpp3
-rw-r--r--src/mongo/base/string_data.h2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/mongo/base/owned_pointer_map_test.cpp b/src/mongo/base/owned_pointer_map_test.cpp
index c6b92ca616d..e1a1a1c0326 100644
--- a/src/mongo/base/owned_pointer_map_test.cpp
+++ b/src/mongo/base/owned_pointer_map_test.cpp
@@ -38,6 +38,7 @@ namespace mongo {
namespace {
using std::make_pair;
+ using std::string;
/** Helper class that logs its constructor argument to a static vector on destruction. */
class DestructionLogger {
diff --git a/src/mongo/base/owned_pointer_vector_test.cpp b/src/mongo/base/owned_pointer_vector_test.cpp
index 35968a037a0..ad00dad0ec0 100644
--- a/src/mongo/base/owned_pointer_vector_test.cpp
+++ b/src/mongo/base/owned_pointer_vector_test.cpp
@@ -35,6 +35,9 @@
#include "mongo/unittest/unittest.h"
namespace mongo {
+
+ using std::string;
+
namespace {
/** Helper class that logs its constructor argument to a static vector on destruction. */
diff --git a/src/mongo/base/string_data.h b/src/mongo/base/string_data.h
index 00bb2c0656b..a1327fefe90 100644
--- a/src/mongo/base/string_data.h
+++ b/src/mongo/base/string_data.h
@@ -37,8 +37,6 @@
namespace mongo {
- using std::string;
-
/**
* A StringData object wraps a 'const std::string&' or a 'const char*' without copying its
* contents. The most common usage is as a function argument that takes any of the two