summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl/collection_cloner_test.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db/repl/collection_cloner_test.cpp')
-rw-r--r--src/mongo/db/repl/collection_cloner_test.cpp39
1 files changed, 19 insertions, 20 deletions
diff --git a/src/mongo/db/repl/collection_cloner_test.cpp b/src/mongo/db/repl/collection_cloner_test.cpp
index 71c2aca517c..420457bd703 100644
--- a/src/mongo/db/repl/collection_cloner_test.cpp
+++ b/src/mongo/db/repl/collection_cloner_test.cpp
@@ -39,7 +39,6 @@
#include "mongo/db/repl/storage_interface.h"
#include "mongo/db/repl/storage_interface_mock.h"
#include "mongo/dbtests/mock/mock_dbclient_connection.h"
-#include "mongo/stdx/memory.h"
#include "mongo/unittest/task_executor_proxy.h"
#include "mongo/unittest/unittest.h"
#include "mongo/util/str.h"
@@ -528,14 +527,14 @@ TEST_F(CollectionClonerTest,
return request.cmdObj.firstElementFieldNameStringData() == "listIndexes";
});
- collectionCloner = stdx::make_unique<CollectionCloner>(&_executorProxy,
- dbWorkThreadPool.get(),
- target,
- nss,
- options,
- setStatusCallback(),
- storageInterface.get(),
- defaultBatchSize);
+ collectionCloner = std::make_unique<CollectionCloner>(&_executorProxy,
+ dbWorkThreadPool.get(),
+ target,
+ nss,
+ options,
+ setStatusCallback(),
+ storageInterface.get(),
+ defaultBatchSize);
ASSERT_OK(collectionCloner->startup());
@@ -1135,17 +1134,17 @@ TEST_F(CollectionClonerTest, CollectionClonerResetsOnCompletionCallbackFunctionA
Status result = getDetectableErrorStatus();
collectionCloner =
- stdx::make_unique<CollectionCloner>(&getExecutor(),
- dbWorkThreadPool.get(),
- target,
- nss,
- options,
- [&result, sharedCallbackData](const Status& status) {
- log() << "setting result to " << status;
- result = status;
- },
- storageInterface.get(),
- defaultBatchSize);
+ std::make_unique<CollectionCloner>(&getExecutor(),
+ dbWorkThreadPool.get(),
+ target,
+ nss,
+ options,
+ [&result, sharedCallbackData](const Status& status) {
+ log() << "setting result to " << status;
+ result = status;
+ },
+ storageInterface.get(),
+ defaultBatchSize);
ASSERT_OK(collectionCloner->startup());
ASSERT_TRUE(collectionCloner->isActive());