summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2015-06-18 15:02:54 -0400
committerAndrew Morrow <acm@mongodb.com>2015-06-19 22:51:28 -0400
commit1178eff1ddf60a7dac3a8cd71e2fdd278aa01b52 (patch)
treeee3096045eb4d2e4f69d57ef85c66b3be69e4302 /src/mongo/db/repl
parent4b5fa5fc711e4cf94291665575fd1c742ad3e7c3 (diff)
downloadmongo-1178eff1ddf60a7dac3a8cd71e2fdd278aa01b52.tar.gz
SERVER-19041 Simplify SimpleMutex
Diffstat (limited to 'src/mongo/db/repl')
-rw-r--r--src/mongo/db/repl/oplog.cpp2
-rw-r--r--src/mongo/db/repl/sync_tail.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp
index 5b3d48fbc21..26708ee8de7 100644
--- a/src/mongo/db/repl/oplog.cpp
+++ b/src/mongo/db/repl/oplog.cpp
@@ -103,7 +103,7 @@ namespace {
// Synchronizes the section where a new Timestamp is generated and when it actually
// appears in the oplog.
- mongo::mutex newOpMutex;
+ stdx::mutex newOpMutex;
stdx::condition_variable newTimestampNotifier;
static std::string _oplogCollectionName;
diff --git a/src/mongo/db/repl/sync_tail.cpp b/src/mongo/db/repl/sync_tail.cpp
index 545dea83f9d..2bfe05728fe 100644
--- a/src/mongo/db/repl/sync_tail.cpp
+++ b/src/mongo/db/repl/sync_tail.cpp
@@ -365,7 +365,7 @@ namespace {
// We must grab this because we're going to grab write locks later.
// We hold this mutex the entire time we're writing; it doesn't matter
// because all readers are blocked anyway.
- SimpleMutex::scoped_lock fsynclk(filesLockedFsync);
+ stdx::lock_guard<SimpleMutex> fsynclk(filesLockedFsync);
// stop all readers until we're done
Lock::ParallelBatchWriterMode pbwm(txn->lockState());