diff options
author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2014-05-19 12:46:52 -0400 |
---|---|---|
committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2014-05-19 14:43:05 -0400 |
commit | f2bfd36a6f3eb7e7e2587268be3cc12636703d42 (patch) | |
tree | 6436772fbceb28f07bbfaee528d700159beb0cec /src/mongo/util/concurrency/value.h | |
parent | c10e8282a7af38f8512e911a14889e14df8a2c6a (diff) | |
download | mongo-f2bfd36a6f3eb7e7e2587268be3cc12636703d42.tar.gz |
SERVER-13256: Remove pch - qualify std in headers
Diffstat (limited to 'src/mongo/util/concurrency/value.h')
-rw-r--r-- | src/mongo/util/concurrency/value.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mongo/util/concurrency/value.h b/src/mongo/util/concurrency/value.h index 0e451f05a36..5dc15684c8a 100644 --- a/src/mongo/util/concurrency/value.h +++ b/src/mongo/util/concurrency/value.h @@ -42,16 +42,16 @@ namespace mongo { */ class DiagStr { mutable SpinLock m; - string _s; + std::string _s; public: DiagStr(const DiagStr& r) : _s(r.get()) { } - DiagStr(const string& r) : _s(r) { } + DiagStr(const std::string& r) : _s(r) { } DiagStr() { } bool empty() const { scoped_spinlock lk(m); return _s.empty(); } - string get() const { + std::string get() const { scoped_spinlock lk(m); return _s; } @@ -59,18 +59,18 @@ namespace mongo { scoped_spinlock lk(m); _s = s; } - void set(const string& s) { + void set(const std::string& s) { scoped_spinlock lk(m); _s = s; } - operator string() const { return get(); } - void operator=(const string& s) { set(s); } + operator std::string() const { return get(); } + void operator=(const std::string& s) { set(s); } void operator=(const DiagStr& rhs) { set( rhs.get() ); } // == is not defined. use get() == ... instead. done this way so one thinks about if composing multiple operations - bool operator==(const string& s) const; + bool operator==(const std::string& s) const; }; } |