summaryrefslogtreecommitdiff
path: root/src/mongo/db/concurrency/lock_state.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db/concurrency/lock_state.h')
-rw-r--r--src/mongo/db/concurrency/lock_state.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mongo/db/concurrency/lock_state.h b/src/mongo/db/concurrency/lock_state.h
index 2201a4fc9e0..c321b6415c7 100644
--- a/src/mongo/db/concurrency/lock_state.h
+++ b/src/mongo/db/concurrency/lock_state.h
@@ -35,8 +35,7 @@
namespace mongo {
-namespace newlm {
-
+
/**
* Notfication callback, which stores the last notification result and signals a condition
* variable, which can be waited on.
@@ -217,7 +216,7 @@ namespace newlm {
virtual bool isLocked() const;
virtual bool isWriteLocked() const;
virtual bool isWriteLocked(const StringData& ns) const;
- virtual bool isDbLockedForMode(const StringData& dbName, newlm::LockMode mode) const;
+ virtual bool isDbLockedForMode(const StringData& dbName, LockMode mode) const;
virtual bool isAtLeastReadLocked(const StringData& ns) const;
virtual bool isRecursive() const;
@@ -296,14 +295,12 @@ namespace newlm {
private:
Locker* _locker;
};
-
-} // namespace newlm
/**
* This will go away as a separate step.
*/
- class LockState : public newlm::LockerImpl {
+ class LockState : public LockerImpl {
public:
LockState() { }