diff options
author | Ben Caimano <ben.caimano@mongodb.com> | 2019-09-17 23:22:19 +0000 |
---|---|---|
committer | evergreen <evergreen@mongodb.com> | 2019-09-17 23:22:19 +0000 |
commit | bc11369435ca51e2ff6897433d00f6b909f6a25f (patch) | |
tree | 251653ec8285d798b41846e343e7e414e80ff277 /src/mongo/unittest | |
parent | 45aea2495306dd61fab46bd398735bb6aaf7b53a (diff) | |
download | mongo-bc11369435ca51e2ff6897433d00f6b909f6a25f.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.h | 6 | ||||
-rw-r--r-- | src/mongo/unittest/unittest.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/unittest/barrier.h b/src/mongo/unittest/barrier.h index 6b3d102fc6f..4332b2480d7 100644 --- a/src/mongo/unittest/barrier.h +++ b/src/mongo/unittest/barrier.h @@ -29,8 +29,8 @@ #pragma once -#include "mongo/stdx/condition_variable.h" -#include "mongo/stdx/mutex.h" +#include "mongo/platform/condition_variable.h" +#include "mongo/platform/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 1aee738eb4a..83f7fa89434 100644 --- a/src/mongo/unittest/unittest.cpp +++ b/src/mongo/unittest/unittest.cpp @@ -46,7 +46,7 @@ #include "mongo/logger/logger.h" #include "mongo/logger/message_event_utf8_encoder.h" #include "mongo/logger/message_log_domain.h" -#include "mongo/stdx/mutex.h" +#include "mongo/platform/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; |