summaryrefslogtreecommitdiff
path: root/src/mongo/unittest
diff options
context:
space:
mode:
authorBen Caimano <ben.caimano@mongodb.com>2019-11-01 17:24:53 +0000
committerevergreen <evergreen@mongodb.com>2019-11-01 17:24:53 +0000
commitbf5bef47a8e6937b4e0d2c9df3fde3470bdc72c9 (patch)
tree8f71a9f272082dd9ee0e471ef5fcb9f19519600d /src/mongo/unittest
parentf210bc645453c05979067c556bf6f2bd43e64134 (diff)
downloadmongo-bf5bef47a8e6937b4e0d2c9df3fde3470bdc72c9.tar.gz
SERVER-42165 Replace uses of stdx::mutex with mongo::Mutex
Diffstat (limited to 'src/mongo/unittest')
-rw-r--r--src/mongo/unittest/barrier.h4
-rw-r--r--src/mongo/unittest/unittest.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/unittest/barrier.h b/src/mongo/unittest/barrier.h
index 6b3d102fc6f..de21587ea3b 100644
--- a/src/mongo/unittest/barrier.h
+++ b/src/mongo/unittest/barrier.h
@@ -29,8 +29,8 @@
#pragma once
+#include "mongo/platform/mutex.h"
#include "mongo/stdx/condition_variable.h"
-#include "mongo/stdx/mutex.h"
namespace mongo {
namespace unittest {
@@ -60,7 +60,7 @@ private:
size_t _threadCount;
size_t _threadsWaiting;
uint64_t _generation;
- stdx::mutex _mutex;
+ stdx::mutex _mutex; // NOLINT
stdx::condition_variable _condition;
};
diff --git a/src/mongo/unittest/unittest.cpp b/src/mongo/unittest/unittest.cpp
index c36799e79fd..b1d6258e5a1 100644
--- a/src/mongo/unittest/unittest.cpp
+++ b/src/mongo/unittest/unittest.cpp
@@ -44,9 +44,9 @@
#include "mongo/logger/logger.h"
#include "mongo/logger/message_event_utf8_encoder.h"
#include "mongo/logger/message_log_domain.h"
+#include "mongo/platform/mutex.h"
#include "mongo/stdx/functional.h"
#include "mongo/stdx/memory.h"
-#include "mongo/stdx/mutex.h"
#include "mongo/util/assert_util.h"
#include "mongo/util/log.h"
#include "mongo/util/stacktrace.h"
@@ -251,7 +251,7 @@ public:
}
private:
- stdx::mutex _mutex;
+ stdx::mutex _mutex; // NOLINT
bool _enabled = false;
logger::MessageEventDetailsEncoder _encoder;
std::vector<std::string>* _lines;