diff options
author | Andrew Morrow <acm@mongodb.com> | 2015-01-09 18:02:51 -0500 |
---|---|---|
committer | Andrew Morrow <acm@mongodb.com> | 2015-01-15 07:04:26 -0500 |
commit | 9f30e21c627e4c73ab0b44e45b7ce657b3e2619f (patch) | |
tree | 4863e66baca59d2733c4d8090ed962ef60908d6a /src/mongo/db/commands | |
parent | 44cafa7dddde7510aa0a05efce807a2e294fdc6d (diff) | |
download | mongo-9f30e21c627e4c73ab0b44e45b7ce657b3e2619f.tar.gz |
SERVER-13256 Add usings and qualifications for names from namespace std
Diffstat (limited to 'src/mongo/db/commands')
49 files changed, 161 insertions, 1 deletions
diff --git a/src/mongo/db/commands/apply_ops.cpp b/src/mongo/db/commands/apply_ops.cpp index dc8c4bd601c..da11dbbcff7 100644 --- a/src/mongo/db/commands/apply_ops.cpp +++ b/src/mongo/db/commands/apply_ops.cpp @@ -45,6 +45,10 @@ #include "mongo/db/repl/oplog.h" namespace mongo { + + using std::string; + using std::stringstream; + class ApplyOpsCmd : public Command { public: virtual bool slaveOk() const { return false; } diff --git a/src/mongo/db/commands/auth_schema_upgrade_d.cpp b/src/mongo/db/commands/auth_schema_upgrade_d.cpp index b3cfba4a4ef..5980b06735e 100644 --- a/src/mongo/db/commands/auth_schema_upgrade_d.cpp +++ b/src/mongo/db/commands/auth_schema_upgrade_d.cpp @@ -44,6 +44,8 @@ namespace mongo { namespace { + using std::string; + Status checkReplicaMemberVersions() { repl::ReplicationCoordinator* replCoord = repl::getGlobalReplicationCoordinator(); diff --git a/src/mongo/db/commands/authentication_commands.cpp b/src/mongo/db/commands/authentication_commands.cpp index f62523c08da..6840b3d3497 100644 --- a/src/mongo/db/commands/authentication_commands.cpp +++ b/src/mongo/db/commands/authentication_commands.cpp @@ -63,6 +63,10 @@ namespace mongo { + using std::hex; + using std::string; + using std::stringstream; + static bool _isCRAuthDisabled; static bool _isX509AuthDisabled; static const char _nonceAuthenticationDisabledMessage[] = diff --git a/src/mongo/db/commands/cleanup_orphaned_cmd.cpp b/src/mongo/db/commands/cleanup_orphaned_cmd.cpp index 6d10d92d2ae..6245481f292 100644 --- a/src/mongo/db/commands/cleanup_orphaned_cmd.cpp +++ b/src/mongo/db/commands/cleanup_orphaned_cmd.cpp @@ -61,6 +61,9 @@ namespace { namespace mongo { + using std::endl; + using std::string; + using mongoutils::str::stream; enum CleanupResult { diff --git a/src/mongo/db/commands/clone.cpp b/src/mongo/db/commands/clone.cpp index dc51dc68d96..0aba60ba805 100644 --- a/src/mongo/db/commands/clone.cpp +++ b/src/mongo/db/commands/clone.cpp @@ -54,6 +54,10 @@ namespace mongo { + using std::set; + using std::string; + using std::stringstream; + /* Usage: mydb.$cmd.findOne( { clone: "fromhost" } ); Note: doesn't work with authentication enabled, except as internal operation or for diff --git a/src/mongo/db/commands/clone_collection.cpp b/src/mongo/db/commands/clone_collection.cpp index 411d481dad6..25f2647451f 100644 --- a/src/mongo/db/commands/clone_collection.cpp +++ b/src/mongo/db/commands/clone_collection.cpp @@ -59,6 +59,11 @@ namespace mongo { + using std::auto_ptr; + using std::string; + using std::stringstream; + using std::endl; + class CmdCloneCollection : public Command { public: CmdCloneCollection() : Command("cloneCollection") { } diff --git a/src/mongo/db/commands/collection_to_capped.cpp b/src/mongo/db/commands/collection_to_capped.cpp index 327125ea1c8..442241d6578 100644 --- a/src/mongo/db/commands/collection_to_capped.cpp +++ b/src/mongo/db/commands/collection_to_capped.cpp @@ -44,6 +44,8 @@ namespace mongo { using boost::scoped_ptr; + using std::string; + using std::stringstream; namespace { diff --git a/src/mongo/db/commands/compact.cpp b/src/mongo/db/commands/compact.cpp index e087220a3d2..ef60369eaeb 100644 --- a/src/mongo/db/commands/compact.cpp +++ b/src/mongo/db/commands/compact.cpp @@ -50,6 +50,9 @@ namespace mongo { + using std::string; + using std::stringstream; + class CompactCmd : public Command { public: virtual bool isWriteCommandForConfigServer() const { return false; } diff --git a/src/mongo/db/commands/connection_status.cpp b/src/mongo/db/commands/connection_status.cpp index abd892f2e28..b45fd97fa83 100644 --- a/src/mongo/db/commands/connection_status.cpp +++ b/src/mongo/db/commands/connection_status.cpp @@ -37,6 +37,10 @@ #include "mongo/db/commands.h" namespace mongo { + + using std::string; + using std::stringstream; + class CmdConnectionStatus : public Command { public: CmdConnectionStatus() : Command("connectionStatus") {} diff --git a/src/mongo/db/commands/copydb.cpp b/src/mongo/db/commands/copydb.cpp index 41e4f13a13b..03b4e43b1b6 100644 --- a/src/mongo/db/commands/copydb.cpp +++ b/src/mongo/db/commands/copydb.cpp @@ -58,6 +58,9 @@ namespace mongo { + using std::string; + using std::stringstream; + /* Usage: * admindb.$cmd.findOne( { copydb: 1, fromhost: <connection string>, fromdb: <db>, * todb: <db>[, username: <username>, nonce: <nonce>, key: <key>] } ); diff --git a/src/mongo/db/commands/copydb_start_commands.cpp b/src/mongo/db/commands/copydb_start_commands.cpp index 47f34c59c10..9bf95923b96 100644 --- a/src/mongo/db/commands/copydb_start_commands.cpp +++ b/src/mongo/db/commands/copydb_start_commands.cpp @@ -60,6 +60,9 @@ namespace mongo { + using std::string; + using std::stringstream; + // SERVER-4328 todo review for concurrency // :( thread_specific_ptr<DBClientBase> authConn_; diff --git a/src/mongo/db/commands/count.cpp b/src/mongo/db/commands/count.cpp index 7cd349d17d5..23ff7875eaf 100644 --- a/src/mongo/db/commands/count.cpp +++ b/src/mongo/db/commands/count.cpp @@ -47,6 +47,8 @@ namespace mongo { using boost::scoped_ptr; + using std::string; + using std::stringstream; /* select count(*) */ class CmdCount : public Command { diff --git a/src/mongo/db/commands/create_indexes.cpp b/src/mongo/db/commands/create_indexes.cpp index 33f9e7da607..e0088bec523 100644 --- a/src/mongo/db/commands/create_indexes.cpp +++ b/src/mongo/db/commands/create_indexes.cpp @@ -49,6 +49,8 @@ namespace mongo { + using std::string; + /** * { createIndexes : "bar", indexes : [ { ns : "test.bar", key : { x : 1 }, name: "x_1" } ] } */ diff --git a/src/mongo/db/commands/dbhash.cpp b/src/mongo/db/commands/dbhash.cpp index 891d19765b2..0066d700874 100644 --- a/src/mongo/db/commands/dbhash.cpp +++ b/src/mongo/db/commands/dbhash.cpp @@ -46,6 +46,12 @@ namespace mongo { using boost::scoped_ptr; + using std::auto_ptr; + using std::list; + using std::endl; + using std::set; + using std::string; + using std::vector; DBHashCmd dbhashCmd; diff --git a/src/mongo/db/commands/distinct.cpp b/src/mongo/db/commands/distinct.cpp index 2260373317a..0ccbd41909f 100644 --- a/src/mongo/db/commands/distinct.cpp +++ b/src/mongo/db/commands/distinct.cpp @@ -46,6 +46,10 @@ namespace mongo { + using std::auto_ptr; + using std::string; + using std::stringstream; + class DistinctCommand : public Command { public: DistinctCommand() : Command("distinct") {} diff --git a/src/mongo/db/commands/drop_indexes.cpp b/src/mongo/db/commands/drop_indexes.cpp index b46ab0c8f15..e43145dfb3b 100644 --- a/src/mongo/db/commands/drop_indexes.cpp +++ b/src/mongo/db/commands/drop_indexes.cpp @@ -53,6 +53,11 @@ namespace mongo { + using std::endl; + using std::string; + using std::stringstream; + using std::vector; + /* "dropIndexes" is now the preferred form - "deleteIndexes" deprecated */ class CmdDropIndexes : public Command { public: diff --git a/src/mongo/db/commands/explain_cmd.cpp b/src/mongo/db/commands/explain_cmd.cpp index 51bed5599e8..9a411c8fa26 100644 --- a/src/mongo/db/commands/explain_cmd.cpp +++ b/src/mongo/db/commands/explain_cmd.cpp @@ -40,6 +40,8 @@ namespace mongo { + using std::string; + static CmdExplain cmdExplain; Status CmdExplain::checkAuthForCommand(ClientBasic* client, diff --git a/src/mongo/db/commands/fail_point_cmd.cpp b/src/mongo/db/commands/fail_point_cmd.cpp index aa3c79c5bcb..7aca28140d9 100644 --- a/src/mongo/db/commands/fail_point_cmd.cpp +++ b/src/mongo/db/commands/fail_point_cmd.cpp @@ -36,6 +36,10 @@ #include "mongo/util/fail_point_service.h" namespace mongo { + + using std::string; + using std::stringstream; + /** * Command for modifying installed fail points. * diff --git a/src/mongo/db/commands/find_and_modify.cpp b/src/mongo/db/commands/find_and_modify.cpp index b131143f632..e8e5ad2d748 100644 --- a/src/mongo/db/commands/find_and_modify.cpp +++ b/src/mongo/db/commands/find_and_modify.cpp @@ -48,6 +48,9 @@ namespace mongo { using boost::scoped_ptr; + using std::endl; + using std::string; + using std::stringstream; /* Find and Modify an object returning either the old (default) or new value*/ class CmdFindAndModify : public Command { diff --git a/src/mongo/db/commands/find_cmd.cpp b/src/mongo/db/commands/find_cmd.cpp index a0a1c21c7b7..89cc90bfc17 100644 --- a/src/mongo/db/commands/find_cmd.cpp +++ b/src/mongo/db/commands/find_cmd.cpp @@ -45,6 +45,8 @@ namespace mongo { using boost::scoped_ptr; + using std::auto_ptr; + using std::string; static FindCmd findCmd; diff --git a/src/mongo/db/commands/fsync.cpp b/src/mongo/db/commands/fsync.cpp index eaaf4beb09b..1fcfd70d4cd 100644 --- a/src/mongo/db/commands/fsync.cpp +++ b/src/mongo/db/commands/fsync.cpp @@ -50,7 +50,11 @@ namespace mongo { - + + using std::endl; + using std::string; + using std::stringstream; + class FSyncLockThread : public BackgroundJob { void doRealWork(); public: diff --git a/src/mongo/db/commands/geo_near_cmd.cpp b/src/mongo/db/commands/geo_near_cmd.cpp index cab42a0bcda..450366da759 100644 --- a/src/mongo/db/commands/geo_near_cmd.cpp +++ b/src/mongo/db/commands/geo_near_cmd.cpp @@ -54,6 +54,7 @@ namespace mongo { using boost::scoped_ptr; + using std::stringstream; class Geo2dFindNearCmd : public Command { public: diff --git a/src/mongo/db/commands/get_last_error.cpp b/src/mongo/db/commands/get_last_error.cpp index bc6959e231d..0d5d5df0675 100644 --- a/src/mongo/db/commands/get_last_error.cpp +++ b/src/mongo/db/commands/get_last_error.cpp @@ -43,6 +43,9 @@ namespace mongo { + using std::string; + using std::stringstream; + /* reset any errors so that getlasterror comes back clean. useful before performing a long series of operations where we want to diff --git a/src/mongo/db/commands/group.cpp b/src/mongo/db/commands/group.cpp index 5f5b87f5e62..2543b9b7a4b 100644 --- a/src/mongo/db/commands/group.cpp +++ b/src/mongo/db/commands/group.cpp @@ -45,6 +45,7 @@ namespace mongo { using boost::scoped_ptr; + using std::string; static GroupCommand cmdGroup; diff --git a/src/mongo/db/commands/hashcmd.cpp b/src/mongo/db/commands/hashcmd.cpp index 8af317bf0ef..94d9267ded7 100644 --- a/src/mongo/db/commands/hashcmd.cpp +++ b/src/mongo/db/commands/hashcmd.cpp @@ -46,6 +46,9 @@ namespace mongo { + using std::string; + using std::stringstream; + // Testing only, enabled via command-line. class CmdHashElt : public Command { public: diff --git a/src/mongo/db/commands/index_filter_commands_test.cpp b/src/mongo/db/commands/index_filter_commands_test.cpp index 3ca48225e28..819a93dfa0c 100644 --- a/src/mongo/db/commands/index_filter_commands_test.cpp +++ b/src/mongo/db/commands/index_filter_commands_test.cpp @@ -45,6 +45,7 @@ using namespace mongo; namespace { using boost::scoped_ptr; + using std::auto_ptr; using std::string; using std::vector; diff --git a/src/mongo/db/commands/isself.cpp b/src/mongo/db/commands/isself.cpp index 0339cfdb0e6..8b6c6fd6d9f 100644 --- a/src/mongo/db/commands/isself.cpp +++ b/src/mongo/db/commands/isself.cpp @@ -36,6 +36,9 @@ namespace mongo { + using std::string; + using std::stringstream; + class IsSelfCommand : public Command { public: IsSelfCommand() : Command("_isSelf") {} diff --git a/src/mongo/db/commands/list_collections.cpp b/src/mongo/db/commands/list_collections.cpp index d9385c62d45..8508390317b 100644 --- a/src/mongo/db/commands/list_collections.cpp +++ b/src/mongo/db/commands/list_collections.cpp @@ -49,6 +49,9 @@ namespace mongo { using boost::scoped_ptr; + using std::list; + using std::string; + using std::stringstream; class CmdListCollections : public Command { public: diff --git a/src/mongo/db/commands/list_databases.cpp b/src/mongo/db/commands/list_databases.cpp index c84f38333b9..603f340bddc 100644 --- a/src/mongo/db/commands/list_databases.cpp +++ b/src/mongo/db/commands/list_databases.cpp @@ -38,6 +38,11 @@ namespace mongo { + using std::set; + using std::string; + using std::stringstream; + using std::vector; + // XXX: remove and put into storage api intmax_t dbSize( const string& database ); diff --git a/src/mongo/db/commands/list_indexes.cpp b/src/mongo/db/commands/list_indexes.cpp index c405bbe8823..16c9678229f 100644 --- a/src/mongo/db/commands/list_indexes.cpp +++ b/src/mongo/db/commands/list_indexes.cpp @@ -45,6 +45,10 @@ namespace mongo { + using std::string; + using std::stringstream; + using std::vector; + /** * Lists the indexes for a given collection. * diff --git a/src/mongo/db/commands/merge_chunks_cmd.cpp b/src/mongo/db/commands/merge_chunks_cmd.cpp index e14a5a40564..df67acc1c8d 100644 --- a/src/mongo/db/commands/merge_chunks_cmd.cpp +++ b/src/mongo/db/commands/merge_chunks_cmd.cpp @@ -38,6 +38,10 @@ namespace mongo { + using std::string; + using std::stringstream; + using std::vector; + /** * Mongod-side command for merging chunks. */ diff --git a/src/mongo/db/commands/mr.cpp b/src/mongo/db/commands/mr.cpp index e330372778d..f6d340b97d3 100644 --- a/src/mongo/db/commands/mr.cpp +++ b/src/mongo/db/commands/mr.cpp @@ -69,6 +69,12 @@ namespace mongo { using boost::scoped_ptr; + using std::auto_ptr; + using std::endl; + using std::set; + using std::string; + using std::stringstream; + using std::vector; namespace mr { diff --git a/src/mongo/db/commands/oplog_note.cpp b/src/mongo/db/commands/oplog_note.cpp index 85789a003cf..3d75399c13d 100644 --- a/src/mongo/db/commands/oplog_note.cpp +++ b/src/mongo/db/commands/oplog_note.cpp @@ -38,6 +38,10 @@ #include "mongo/db/repl/replication_coordinator_global.h" namespace mongo { + + using std::string; + using std::stringstream; + class AppendOplogNoteCmd : public Command { public: AppendOplogNoteCmd() : Command( "appendOplogNote" ) {} diff --git a/src/mongo/db/commands/parallel_collection_scan.cpp b/src/mongo/db/commands/parallel_collection_scan.cpp index 4ac77855f0d..89c0d888361 100644 --- a/src/mongo/db/commands/parallel_collection_scan.cpp +++ b/src/mongo/db/commands/parallel_collection_scan.cpp @@ -38,6 +38,8 @@ namespace mongo { + using std::auto_ptr; + using std::string; class ParallelCollectionScanCmd : public Command { public: diff --git a/src/mongo/db/commands/parameters.cpp b/src/mongo/db/commands/parameters.cpp index 9d864b26eb4..adaa3b0bda4 100644 --- a/src/mongo/db/commands/parameters.cpp +++ b/src/mongo/db/commands/parameters.cpp @@ -46,6 +46,7 @@ #include "mongo/util/net/ssl_options.h" using std::string; +using std::stringstream; namespace mongo { diff --git a/src/mongo/db/commands/pipeline_command.cpp b/src/mongo/db/commands/pipeline_command.cpp index ad8cbb0bcb0..a01fad5f1d4 100644 --- a/src/mongo/db/commands/pipeline_command.cpp +++ b/src/mongo/db/commands/pipeline_command.cpp @@ -57,6 +57,10 @@ namespace mongo { using boost::intrusive_ptr; using boost::scoped_ptr; using boost::shared_ptr; + using std::auto_ptr; + using std::string; + using std::stringstream; + using std::endl; /** * Returns true if we need to keep a ClientCursor saved for this pipeline (for future getMore diff --git a/src/mongo/db/commands/plan_cache_commands_test.cpp b/src/mongo/db/commands/plan_cache_commands_test.cpp index e723923d185..3ed53afc8f8 100644 --- a/src/mongo/db/commands/plan_cache_commands_test.cpp +++ b/src/mongo/db/commands/plan_cache_commands_test.cpp @@ -47,6 +47,7 @@ using namespace mongo; namespace { using boost::scoped_ptr; + using std::auto_ptr; using std::string; using std::vector; diff --git a/src/mongo/db/commands/rename_collection.cpp b/src/mongo/db/commands/rename_collection.cpp index 2c87fa0d1e8..dcc1a1b68d6 100644 --- a/src/mongo/db/commands/rename_collection.cpp +++ b/src/mongo/db/commands/rename_collection.cpp @@ -49,6 +49,10 @@ namespace mongo { + using std::min; + using std::string; + using std::stringstream; + class CmdRenameCollection : public Command { public: CmdRenameCollection() : Command( "renameCollection" ) {} diff --git a/src/mongo/db/commands/repair_cursor.cpp b/src/mongo/db/commands/repair_cursor.cpp index 7aa680e115f..b521d526932 100644 --- a/src/mongo/db/commands/repair_cursor.cpp +++ b/src/mongo/db/commands/repair_cursor.cpp @@ -38,6 +38,8 @@ namespace mongo { + using std::string; + class RepairCursorCmd : public Command { public: RepairCursorCmd() : Command("repairCursor") {} diff --git a/src/mongo/db/commands/server_status.cpp b/src/mongo/db/commands/server_status.cpp index a2541ca3324..cbe61fb104f 100644 --- a/src/mongo/db/commands/server_status.cpp +++ b/src/mongo/db/commands/server_status.cpp @@ -56,6 +56,11 @@ namespace mongo { + using std::endl; + using std::map; + using std::string; + using std::stringstream; + class CmdServerStatus : public Command { public: diff --git a/src/mongo/db/commands/server_status_internal.cpp b/src/mongo/db/commands/server_status_internal.cpp index 731379a37d6..e329a3724a4 100644 --- a/src/mongo/db/commands/server_status_internal.cpp +++ b/src/mongo/db/commands/server_status_internal.cpp @@ -37,6 +37,11 @@ namespace mongo { + using std::cerr; + using std::endl; + using std::map; + using std::string; + using namespace mongoutils; MetricTree* MetricTree::theMetricTree = NULL; diff --git a/src/mongo/db/commands/server_status_metric.cpp b/src/mongo/db/commands/server_status_metric.cpp index 285ec813fcf..1e999635751 100644 --- a/src/mongo/db/commands/server_status_metric.cpp +++ b/src/mongo/db/commands/server_status_metric.cpp @@ -34,6 +34,8 @@ namespace mongo { + using std::string; + ServerStatusMetric::ServerStatusMetric(const string& nameIn) : _name( nameIn ), _leafName( _parseLeafName( nameIn ) ) { diff --git a/src/mongo/db/commands/test_commands.cpp b/src/mongo/db/commands/test_commands.cpp index 9401d555894..5bee0bf654c 100644 --- a/src/mongo/db/commands/test_commands.cpp +++ b/src/mongo/db/commands/test_commands.cpp @@ -45,6 +45,10 @@ namespace mongo { + using std::endl; + using std::string; + using std::stringstream; + /* For testing only, not for general use. Enabled via command-line */ class GodInsert : public Command { public: diff --git a/src/mongo/db/commands/touch.cpp b/src/mongo/db/commands/touch.cpp index d514a8ba69c..063d6225976 100644 --- a/src/mongo/db/commands/touch.cpp +++ b/src/mongo/db/commands/touch.cpp @@ -51,6 +51,9 @@ namespace mongo { + using std::string; + using std::stringstream; + class TouchCmd : public Command { public: virtual bool isWriteCommandForConfigServer() const { return false; } diff --git a/src/mongo/db/commands/user_management_commands.cpp b/src/mongo/db/commands/user_management_commands.cpp index d4b09c365bc..23e9ac4cedf 100644 --- a/src/mongo/db/commands/user_management_commands.cpp +++ b/src/mongo/db/commands/user_management_commands.cpp @@ -68,6 +68,11 @@ namespace mongo { namespace str = mongoutils::str; + using std::endl; + using std::string; + using std::stringstream; + using std::vector; + static void redactPasswordData(mutablebson::Element parent) { namespace mmb = mutablebson; const StringData pwdFieldName("pwd", StringData::LiteralTag()); diff --git a/src/mongo/db/commands/validate.cpp b/src/mongo/db/commands/validate.cpp index 3e6a2dd3af0..51487d34512 100644 --- a/src/mongo/db/commands/validate.cpp +++ b/src/mongo/db/commands/validate.cpp @@ -40,6 +40,10 @@ namespace mongo { + using std::endl; + using std::string; + using std::stringstream; + class ValidateCmd : public Command { public: ValidateCmd() : Command( "validate" ) {} diff --git a/src/mongo/db/commands/write_commands/batch_executor.cpp b/src/mongo/db/commands/write_commands/batch_executor.cpp index b5727d28e7e..0b36db13b54 100644 --- a/src/mongo/db/commands/write_commands/batch_executor.cpp +++ b/src/mongo/db/commands/write_commands/batch_executor.cpp @@ -75,6 +75,10 @@ namespace mongo { using boost::scoped_ptr; + using std::auto_ptr; + using std::endl; + using std::string; + using std::vector; namespace { diff --git a/src/mongo/db/commands/write_commands/write_commands.cpp b/src/mongo/db/commands/write_commands/write_commands.cpp index db3e9e0f6d8..e5b2feeaa90 100644 --- a/src/mongo/db/commands/write_commands/write_commands.cpp +++ b/src/mongo/db/commands/write_commands/write_commands.cpp @@ -51,6 +51,9 @@ namespace mongo { + using std::string; + using std::stringstream; + namespace { MONGO_INITIALIZER(RegisterWriteCommands)(InitializerContext* context) { diff --git a/src/mongo/db/commands/writeback_compatibility_shim.cpp b/src/mongo/db/commands/writeback_compatibility_shim.cpp index 48fe076974b..7441ed5d273 100644 --- a/src/mongo/db/commands/writeback_compatibility_shim.cpp +++ b/src/mongo/db/commands/writeback_compatibility_shim.cpp @@ -44,6 +44,8 @@ namespace mongo { using std::string; + using std::stringstream; + using mongoutils::str::stream; /** |