diff options
Diffstat (limited to 'src/mongo/db/repl/do_txn_test.cpp')
-rw-r--r-- | src/mongo/db/repl/do_txn_test.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/mongo/db/repl/do_txn_test.cpp b/src/mongo/db/repl/do_txn_test.cpp index 810e7401da3..07547e3515f 100644 --- a/src/mongo/db/repl/do_txn_test.cpp +++ b/src/mongo/db/repl/do_txn_test.cpp @@ -29,6 +29,8 @@ #include "mongo/platform/basic.h" +#include <memory> + #include "mongo/db/catalog/collection_options.h" #include "mongo/db/catalog/database_holder.h" #include "mongo/db/client.h" @@ -46,7 +48,6 @@ #include "mongo/db/transaction_participant.h" #include "mongo/logger/logger.h" #include "mongo/rpc/get_status_from_command_result.h" -#include "mongo/stdx/memory.h" namespace mongo { namespace repl { @@ -147,7 +148,7 @@ void DoTxnTest::setUp() { _opCtx = cc().makeOperationContext(); // Set up ReplicationCoordinator and create oplog. - ReplicationCoordinator::set(service, stdx::make_unique<ReplicationCoordinatorMock>(service)); + ReplicationCoordinator::set(service, std::make_unique<ReplicationCoordinatorMock>(service)); setOplogCollectionName(service); createOplog(_opCtx.get()); @@ -161,21 +162,21 @@ void DoTxnTest::setUp() { // Need the OpObserverImpl in the registry in order for doTxn to work. OpObserverRegistry* opObserverRegistry = dynamic_cast<OpObserverRegistry*>(service->getOpObserver()); - opObserverRegistry->addObserver(stdx::make_unique<OpObserverShardingImpl>()); + opObserverRegistry->addObserver(std::make_unique<OpObserverShardingImpl>()); // Use OpObserverMock to track applyOps calls generated by doTxn(). - auto opObserver = stdx::make_unique<OpObserverMock>(); + auto opObserver = std::make_unique<OpObserverMock>(); _opObserver = opObserver.get(); opObserverRegistry->addObserver(std::move(opObserver)); // This test uses StorageInterface to create collections and inspect documents inside // collections. - _storage = stdx::make_unique<StorageInterfaceImpl>(); + _storage = std::make_unique<StorageInterfaceImpl>(); // We also need to give replication a StorageInterface for checking out the transaction. // The test storage engine doesn't support the necessary call (getPointInTimeReadTimestamp()), // so we use a mock. - repl::StorageInterface::set(service, stdx::make_unique<StorageInterfaceMock>()); + repl::StorageInterface::set(service, std::make_unique<StorageInterfaceMock>()); // Set up the transaction and session. _opCtx->setLogicalSessionId(makeLogicalSessionIdForTest()); |