SERVER-28300 Fix lint

3 files changed, 8 insertions, 6 deletions

diff --git a/src/mongo/db/logical_session_cache.cpp b/src/mongo/db/logical_session_cache.cpp
index 902bd9c9a02..9ab51495f52 100644
--- a/src/mongo/db/logical_session_cache.cpp
+++ b/src/mongo/db/logical_session_cache.cpp
@@ -99,7 +99,7 @@ StatusWith<LogicalSessionRecord::Owner> LogicalSessionCache::getOwner(LogicalSes
 
 StatusWith<LogicalSessionRecord::Owner> LogicalSessionCache::getOwnerFromCache(
     LogicalSessionId lsid) {
-    std::unique_lock<stdx::mutex> lk(_cacheMutex);
+    stdx::unique_lock<stdx::mutex> lk(_cacheMutex);
     auto it = _cache.find(lsid);
     if (it == _cache.end()) {
         return {ErrorCodes::NoSuchSession, "no matching session record found in the cache"};
diff --git a/src/mongo/db/logical_session_cache_test.cpp b/src/mongo/db/logical_session_cache_test.cpp
index 32e0771e965..93800d6c153 100644
--- a/src/mongo/db/logical_session_cache_test.cpp
+++ b/src/mongo/db/logical_session_cache_test.cpp
@@ -36,6 +36,7 @@
 #include "mongo/db/service_liason_mock.h"
 #include "mongo/db/sessions_collection_mock.h"
 #include "mongo/stdx/future.h"
+#include "mongo/stdx/memory.h"
 #include "mongo/unittest/unittest.h"
 
 namespace mongo {
@@ -61,10 +62,10 @@ public:
           _userId(OID::gen()) {}
 
     void setUp() override {
-        auto mockService = std::make_unique<MockServiceLiason>(_service);
-        auto mockSessions = std::make_unique<MockSessionsCollection>(_sessions);
+        auto mockService = stdx::make_unique<MockServiceLiason>(_service);
+        auto mockSessions = stdx::make_unique<MockSessionsCollection>(_sessions);
         _cache =
-            std::make_unique<LogicalSessionCache>(std::move(mockService), std::move(mockSessions));
+            stdx::make_unique<LogicalSessionCache>(std::move(mockService), std::move(mockSessions));
     }
 
     void tearDown() override {
diff --git a/src/mongo/db/service_liason_mock.cpp b/src/mongo/db/service_liason_mock.cpp
index 99c63101d15..6aed1c0306f 100644
--- a/src/mongo/db/service_liason_mock.cpp
+++ b/src/mongo/db/service_liason_mock.cpp
@@ -31,13 +31,14 @@
 #include <algorithm>
 
 #include "mongo/db/service_liason_mock.h"
+#include "mongo/stdx/memory.h"
 
 namespace mongo {
 
 MockServiceLiasonImpl::MockServiceLiasonImpl() {
-    auto timerFactory = std::make_unique<executor::AsyncTimerFactoryMock>();
+    auto timerFactory = stdx::make_unique<executor::AsyncTimerFactoryMock>();
     _timerFactory = timerFactory.get();
-    _runner = std::make_unique<PeriodicRunnerASIO>(std::move(timerFactory));
+    _runner = stdx::make_unique<PeriodicRunnerASIO>(std::move(timerFactory));
     _runner->startup();
 }