summaryrefslogtreecommitdiff
path: root/src/mongo/dbtests/framework.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/framework.cpp
parent4b5fa5fc711e4cf94291665575fd1c742ad3e7c3 (diff)
downloadmongo-1178eff1ddf60a7dac3a8cd71e2fdd278aa01b52.tar.gz
SERVER-19041 Simplify SimpleMutex
Diffstat (limited to 'src/mongo/dbtests/framework.cpp')
-rw-r--r--src/mongo/dbtests/framework.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/dbtests/framework.cpp b/src/mongo/dbtests/framework.cpp
index dab30d47f74..d91e7012cea 100644
--- a/src/mongo/dbtests/framework.cpp
+++ b/src/mongo/dbtests/framework.cpp
@@ -50,9 +50,9 @@
#include "mongo/s/d_state.h"
#include "mongo/s/grid.h"
#include "mongo/s/catalog/legacy/legacy_dist_lock_manager.h"
+#include "mongo/stdx/mutex.h"
#include "mongo/util/assert_util.h"
#include "mongo/util/background.h"
-#include "mongo/util/concurrency/mutex.h"
#include "mongo/util/exit.h"
#include "mongo/util/log.h"
#include "mongo/util/version.h"
@@ -66,7 +66,7 @@ namespace mongo {
namespace dbtests {
- mutex globalCurrentTestNameMutex;
+ stdx::mutex globalCurrentTestNameMutex;
std::string globalCurrentTestName;
class TestWatchDog : public BackgroundJob {