summaryrefslogtreecommitdiff
path: root/src/mongo/db/concurrency/lock_state.cpp
diff options
context:
space:
mode:
authorAdam Midvidy <amidvidy@gmail.com>2015-06-17 10:27:13 -0400
committerAdam Midvidy <amidvidy@gmail.com>2015-06-17 13:32:39 -0400
commit449e0f2b47e32060433cb6f68d967ea53c8573d1 (patch)
tree6e857f03a636b34ad8710e0b3e35a9115523483b /src/mongo/db/concurrency/lock_state.cpp
parentcbc69e7dcb875b35e161875317bca701b48c770c (diff)
downloadmongo-449e0f2b47e32060433cb6f68d967ea53c8573d1.tar.gz
SERVER-18723 boost -> stdx for mutex, unique_lock, and lock_guard
Diffstat (limited to 'src/mongo/db/concurrency/lock_state.cpp')
-rw-r--r--src/mongo/db/concurrency/lock_state.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/concurrency/lock_state.cpp b/src/mongo/db/concurrency/lock_state.cpp
index b2047138669..6c12a8ae1b1 100644
--- a/src/mongo/db/concurrency/lock_state.cpp
+++ b/src/mongo/db/concurrency/lock_state.cpp
@@ -227,7 +227,7 @@ namespace {
}
LockResult CondVarLockGrantNotification::wait(unsigned timeoutMs) {
- boost::unique_lock<boost::mutex> lock(_mutex);
+ stdx::unique_lock<stdx::mutex> lock(_mutex);
while (_result == LOCK_INVALID) {
if (boost::cv_status::timeout == _cond.wait_for(lock, Milliseconds(timeoutMs))) {
// Timeout
@@ -239,7 +239,7 @@ namespace {
}
void CondVarLockGrantNotification::notify(ResourceId resId, LockResult result) {
- boost::unique_lock<boost::mutex> lock(_mutex);
+ stdx::unique_lock<stdx::mutex> lock(_mutex);
invariant(_result == LOCK_INVALID);
_result = result;
@@ -778,7 +778,7 @@ namespace {
bool LockerImpl<IsForMMAPV1>::hasStrongLocks() const {
if (!isLocked()) return false;
- boost::lock_guard<SpinLock> lk(_lock);
+ stdx::lock_guard<SpinLock> lk(_lock);
LockRequestsMap::ConstIterator it = _requests.begin();
while (!it.finished()) {
if (it->mode == MODE_X || it->mode == MODE_S) {