diff options
Diffstat (limited to 'src/mongo/dbtests/dbtests.cpp')
| -rw-r--r-- | src/mongo/dbtests/dbtests.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/mongo/dbtests/dbtests.cpp b/src/mongo/dbtests/dbtests.cpp index 1fefee04e74..c61f4d390b2 100644 --- a/src/mongo/dbtests/dbtests.cpp +++ b/src/mongo/dbtests/dbtests.cpp @@ -35,6 +35,8 @@ #include "mongo/dbtests/dbtests.h" +#include <memory> + #include "mongo/base/init.h" #include "mongo/base/initializer.h" #include "mongo/db/auth/authorization_manager.h" @@ -53,7 +55,6 @@ #include "mongo/db/wire_version.h" #include "mongo/dbtests/framework.h" #include "mongo/scripting/engine.h" -#include "mongo/stdx/memory.h" #include "mongo/transport/transport_layer_manager.h" #include "mongo/util/clock_source_mock.h" #include "mongo/util/quick_exit.h" @@ -179,10 +180,10 @@ int dbtestsMain(int argc, char** argv, char** envp) { const auto service = getGlobalServiceContext(); service->setServiceEntryPoint(std::make_unique<ServiceEntryPointMongod>(service)); - auto logicalClock = stdx::make_unique<LogicalClock>(service); + auto logicalClock = std::make_unique<LogicalClock>(service); LogicalClock::set(service, std::move(logicalClock)); - auto fastClock = stdx::make_unique<ClockSourceMock>(); + auto fastClock = std::make_unique<ClockSourceMock>(); // Timestamps are split into two 32-bit integers, seconds and "increments". Currently (but // maybe not for eternity), a Timestamp with a value of `0` seconds is always considered // "null" by `Timestamp::isNull`, regardless of its increment value. Ticking the @@ -191,7 +192,7 @@ int dbtestsMain(int argc, char** argv, char** envp) { fastClock->advance(Seconds(1)); service->setFastClockSource(std::move(fastClock)); - auto preciseClock = stdx::make_unique<ClockSourceMock>(); + auto preciseClock = std::make_unique<ClockSourceMock>(); // See above. preciseClock->advance(Seconds(1)); service->setPreciseClockSource(std::move(preciseClock)); @@ -207,9 +208,9 @@ int dbtestsMain(int argc, char** argv, char** envp) { ->setFollowerMode(repl::MemberState::RS_PRIMARY) .ignore(); - auto storageMock = stdx::make_unique<repl::StorageInterfaceMock>(); + auto storageMock = std::make_unique<repl::StorageInterfaceMock>(); repl::DropPendingCollectionReaper::set( - service, stdx::make_unique<repl::DropPendingCollectionReaper>(storageMock.get())); + service, std::make_unique<repl::DropPendingCollectionReaper>(storageMock.get())); AuthorizationManager::get(service)->setAuthEnabled(false); ScriptEngine::setup(); |