summaryrefslogtreecommitdiff
path: root/src/mongo/db/operation_context_test.cpp
diff options
context:
space:
mode:
authorADAM David Alan Martin <adam.martin@10gen.com>2019-06-10 01:21:01 -0400
committerADAM David Alan Martin <adam.martin@10gen.com>2019-06-10 01:59:35 -0400
commitc36f9ecb91e49da7e637863889804fc4e6c6c05e (patch)
tree64d8aadb6d29042d4f4e7366bc1457e4e0612383 /src/mongo/db/operation_context_test.cpp
parentc9548e729c8fecd9d7a9a5dd341da0433194ac73 (diff)
downloadmongo-c36f9ecb91e49da7e637863889804fc4e6c6c05e.tar.gz
SERVER-39339 Remove `stdx/memory.h`
Diffstat (limited to 'src/mongo/db/operation_context_test.cpp')
-rw-r--r--src/mongo/db/operation_context_test.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/db/operation_context_test.cpp b/src/mongo/db/operation_context_test.cpp
index 81a24cb65e9..43b4a51df5d 100644
--- a/src/mongo/db/operation_context_test.cpp
+++ b/src/mongo/db/operation_context_test.cpp
@@ -30,6 +30,7 @@
#include "mongo/platform/basic.h"
#include <boost/optional.hpp>
+#include <memory>
#include "mongo/db/client.h"
#include "mongo/db/json.h"
@@ -38,7 +39,6 @@
#include "mongo/db/operation_context_group.h"
#include "mongo/db/service_context.h"
#include "mongo/stdx/future.h"
-#include "mongo/stdx/memory.h"
#include "mongo/stdx/thread.h"
#include "mongo/unittest/barrier.h"
#include "mongo/unittest/death_test.h"
@@ -247,9 +247,9 @@ class OperationDeadlineTests : public unittest::Test {
public:
void setUp() {
service = ServiceContext::make();
- service->setFastClockSource(stdx::make_unique<SharedClockSourceAdapter>(mockClock));
- service->setPreciseClockSource(stdx::make_unique<SharedClockSourceAdapter>(mockClock));
- service->setTickSource(stdx::make_unique<TickSourceMock<>>());
+ service->setFastClockSource(std::make_unique<SharedClockSourceAdapter>(mockClock));
+ service->setPreciseClockSource(std::make_unique<SharedClockSourceAdapter>(mockClock));
+ service->setTickSource(std::make_unique<TickSourceMock<>>());
client = service->makeClient("OperationDeadlineTest");
}