summaryrefslogtreecommitdiff
path: root/src/mongo/dbtests/threadedtests.cpp
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/dbtests/threadedtests.cpp
parent4b5fa5fc711e4cf94291665575fd1c742ad3e7c3 (diff)
downloadmongo-1178eff1ddf60a7dac3a8cd71e2fdd278aa01b52.tar.gz
SERVER-19041 Simplify SimpleMutex
Diffstat (limited to 'src/mongo/dbtests/threadedtests.cpp')
-rw-r--r--src/mongo/dbtests/threadedtests.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/dbtests/threadedtests.cpp b/src/mongo/dbtests/threadedtests.cpp
index 4f714dd4a10..e8af4c8fdd5 100644
--- a/src/mongo/dbtests/threadedtests.cpp
+++ b/src/mongo/dbtests/threadedtests.cpp
@@ -591,7 +591,7 @@ namespace ThreadedTests {
template <class whichmutex, class scoped>
class Slack : public ThreadedTest<17> {
public:
- Slack() : m("slack") {
+ Slack() {
k = 0;
done = false;
a = b = 0;
@@ -769,7 +769,7 @@ namespace ThreadedTests {
verify( _checkedIn >= 0 );
}
- mongo::mutex _frontDesk;
+ stdx::mutex _frontDesk;
int _nRooms;
int _checkedIn;
int _maxRooms;
@@ -821,7 +821,7 @@ namespace ThreadedTests {
// Slack is a test to see how long it takes for another thread to pick up
// and begin work after another relinquishes the lock. e.g. a spin lock
// would have very little slack.
- add< Slack<SimpleMutex,SimpleMutex::scoped_lock> >();
+ add< Slack<SimpleMutex,stdx::lock_guard<SimpleMutex>> >();
add< Slack<SimpleRWLock,SimpleRWLock::Exclusive> >();
add< CondSlack >();