diff options
author | Andrew Morrow <acm@mongodb.com> | 2015-01-09 17:35:57 -0500 |
---|---|---|
committer | Andrew Morrow <acm@mongodb.com> | 2015-01-15 07:04:25 -0500 |
commit | 44cafa7dddde7510aa0a05efce807a2e294fdc6d (patch) | |
tree | 11d6e26cfa491a0f498c3ce650ee402ec4d7084b /src/mongo/scripting | |
parent | 40f28cd947e8a5227c5a4f6961143ad1b041105f (diff) | |
download | mongo-44cafa7dddde7510aa0a05efce807a2e294fdc6d.tar.gz |
SERVER-13256 Add std namespace qualifications in headers
Diffstat (limited to 'src/mongo/scripting')
-rw-r--r-- | src/mongo/scripting/bson_template_evaluator.h | 2 | ||||
-rw-r--r-- | src/mongo/scripting/engine_v8-3.25.h | 10 | ||||
-rw-r--r-- | src/mongo/scripting/v8_deadline_monitor.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/mongo/scripting/bson_template_evaluator.h b/src/mongo/scripting/bson_template_evaluator.h index c43f18e58c1..d5fe8353524 100644 --- a/src/mongo/scripting/bson_template_evaluator.h +++ b/src/mongo/scripting/bson_template_evaluator.h @@ -137,7 +137,7 @@ namespace mongo { OperatorMap _operatorFunctions; // map that holds variable name and value pairs - typedef std::map<string, BSONObj> VarMap; + typedef std::map<std::string, BSONObj> VarMap; VarMap _varMap; // evaluates a BSON element. This is internally called by the top level evaluate method. diff --git a/src/mongo/scripting/engine_v8-3.25.h b/src/mongo/scripting/engine_v8-3.25.h index c78d8b97b35..680e0e125f4 100644 --- a/src/mongo/scripting/engine_v8-3.25.h +++ b/src/mongo/scripting/engine_v8-3.25.h @@ -198,7 +198,7 @@ namespace mongo { virtual void installBSONTypes(); - virtual string getError() { return _error; } + virtual std::string getError() { return _error; } virtual bool hasOutOfMemoryException(); @@ -216,7 +216,7 @@ namespace mongo { virtual double getNumber(const char* field); virtual int getNumberInt(const char* field); virtual long long getNumberLongLong(const char* field); - virtual string getString(const char* field); + virtual std::string getString(const char* field); virtual bool getBoolean(const char* field); virtual BSONObj getObject(const char* field); @@ -235,7 +235,7 @@ namespace mongo { int timeoutMs = 0, bool ignoreReturn = false, bool readOnlyArgs = false, bool readOnlyRecv = false); - virtual bool exec(const StringData& code, const string& name, bool printResult, + virtual bool exec(const StringData& code, const std::string& name, bool printResult, bool reportError, bool assertOnError, int timeoutMs); // functions to create v8 object and function templates @@ -457,7 +457,7 @@ namespace mongo { v8::Eternal<v8::Context> _context; v8::Eternal<v8::Object> _global; - string _error; + std::string _error; std::vector<v8::Eternal<v8::Value> > _funcs; enum ConnectState { NOT, LOCAL, EXTERNAL }; @@ -562,7 +562,7 @@ namespace mongo { */ DeadlineMonitor<V8Scope>* getDeadlineMonitor() { return &_deadlineMonitor; } - typedef map<unsigned, V8Scope*> OpIdToScopeMap; + typedef std::map<unsigned, V8Scope*> OpIdToScopeMap; mongo::mutex _globalInterruptLock; // protects map of all operation ids -> scope OpIdToScopeMap _opToScopeMap; // map of mongo op ids to scopes (protected by // _globalInterruptLock). diff --git a/src/mongo/scripting/v8_deadline_monitor.h b/src/mongo/scripting/v8_deadline_monitor.h index d3abfb27266..45913e65b48 100644 --- a/src/mongo/scripting/v8_deadline_monitor.h +++ b/src/mongo/scripting/v8_deadline_monitor.h @@ -92,7 +92,7 @@ namespace mongo { // insert or update the deadline std::pair<typename TaskDeadlineMap::iterator, bool> inserted = - _tasks.insert(make_pair(task, now + timeoutMs)); + _tasks.insert(std::make_pair(task, now + timeoutMs)); if (!inserted.second) inserted.first->second = now + timeoutMs; |