summaryrefslogtreecommitdiff
path: root/src/mongo/s
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2015-01-09 17:35:57 -0500
committerAndrew Morrow <acm@mongodb.com>2015-01-15 07:04:25 -0500
commit44cafa7dddde7510aa0a05efce807a2e294fdc6d (patch)
tree11d6e26cfa491a0f498c3ce650ee402ec4d7084b /src/mongo/s
parent40f28cd947e8a5227c5a4f6961143ad1b041105f (diff)
downloadmongo-44cafa7dddde7510aa0a05efce807a2e294fdc6d.tar.gz
SERVER-13256 Add std namespace qualifications in headers
Diffstat (limited to 'src/mongo/s')
-rw-r--r--src/mongo/s/chunk_manager_targeter.h2
-rw-r--r--src/mongo/s/cluster_explain.h10
-rw-r--r--src/mongo/s/commands/cluster_explain_cmd.h6
-rw-r--r--src/mongo/s/commands/cluster_find_cmd.h6
-rw-r--r--src/mongo/s/grid.h2
-rw-r--r--src/mongo/s/scc_fast_query_handler.h18
6 files changed, 22 insertions, 22 deletions
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: