diff options
Diffstat (limited to 'src/mongo/db/views')
-rw-r--r-- | src/mongo/db/views/view_catalog_test.cpp | 7 | ||||
-rw-r--r-- | src/mongo/db/views/view_definition_test.cpp | 5 | ||||
-rw-r--r-- | src/mongo/db/views/view_graph_test.cpp | 3 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/mongo/db/views/view_catalog_test.cpp b/src/mongo/db/views/view_catalog_test.cpp index b9c82fc1a36..8ad236b37df 100644 --- a/src/mongo/db/views/view_catalog_test.cpp +++ b/src/mongo/db/views/view_catalog_test.cpp @@ -51,7 +51,6 @@ #include "mongo/db/views/view.h" #include "mongo/db/views/view_catalog.h" #include "mongo/db/views/view_graph.h" -#include "mongo/stdx/memory.h" #include "mongo/unittest/unittest.h" #include "mongo/util/str.h" @@ -109,7 +108,7 @@ const std::string DurableViewCatalogDummy::name = "dummy"; class ViewCatalogFixture : public unittest::Test { public: ViewCatalogFixture() - : _queryServiceContext(stdx::make_unique<QueryTestServiceContext>()), + : _queryServiceContext(std::make_unique<QueryTestServiceContext>()), opCtx(_queryServiceContext->makeOperationContext()), viewCatalog(std::move(durableViewCatalogUnique)) {} @@ -140,8 +139,8 @@ public: settings.setReplSetString("viewCatalogTestSet/node1:12345"); - repl::StorageInterface::set(service, stdx::make_unique<repl::StorageInterfaceMock>()); - auto replCoord = stdx::make_unique<repl::ReplicationCoordinatorMock>(service, settings); + repl::StorageInterface::set(service, std::make_unique<repl::StorageInterfaceMock>()); + auto replCoord = std::make_unique<repl::ReplicationCoordinatorMock>(service, settings); // Ensure that we are primary. ASSERT_OK(replCoord->setFollowerMode(repl::MemberState::RS_PRIMARY)); diff --git a/src/mongo/db/views/view_definition_test.cpp b/src/mongo/db/views/view_definition_test.cpp index a2aa0ed2536..67bb1dec78b 100644 --- a/src/mongo/db/views/view_definition_test.cpp +++ b/src/mongo/db/views/view_definition_test.cpp @@ -38,7 +38,6 @@ #include "mongo/db/namespace_string.h" #include "mongo/db/query/collation/collator_interface_mock.h" #include "mongo/db/views/view.h" -#include "mongo/stdx/memory.h" #include "mongo/unittest/death_test.h" #include "mongo/unittest/unittest.h" @@ -58,7 +57,7 @@ TEST(ViewDefinitionTest, ViewDefinitionCreationCorrectlyBuildsNamespaceStrings) TEST(ViewDefinitionTest, CopyConstructorProperlyClonesAllFields) { auto collator = - stdx::make_unique<CollatorInterfaceMock>(CollatorInterfaceMock::MockType::kReverseString); + std::make_unique<CollatorInterfaceMock>(CollatorInterfaceMock::MockType::kReverseString); ViewDefinition originalView( viewNss.db(), viewNss.coll(), backingNss.coll(), samplePipeline, std::move(collator)); ViewDefinition copiedView(originalView); @@ -75,7 +74,7 @@ TEST(ViewDefinitionTest, CopyConstructorProperlyClonesAllFields) { TEST(ViewDefinitionTest, CopyAssignmentOperatorProperlyClonesAllFields) { auto collator = - stdx::make_unique<CollatorInterfaceMock>(CollatorInterfaceMock::MockType::kReverseString); + std::make_unique<CollatorInterfaceMock>(CollatorInterfaceMock::MockType::kReverseString); ViewDefinition originalView( viewNss.db(), viewNss.coll(), backingNss.coll(), samplePipeline, std::move(collator)); ViewDefinition copiedView = originalView; diff --git a/src/mongo/db/views/view_graph_test.cpp b/src/mongo/db/views/view_graph_test.cpp index 8d20a30fd53..5ace80ef15a 100644 --- a/src/mongo/db/views/view_graph_test.cpp +++ b/src/mongo/db/views/view_graph_test.cpp @@ -29,6 +29,8 @@ #include "mongo/platform/basic.h" +#include <memory> + #include "mongo/bson/bsonmisc.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" @@ -38,7 +40,6 @@ #include "mongo/db/query/query_test_service_context.h" #include "mongo/db/views/view.h" #include "mongo/db/views/view_graph.h" -#include "mongo/stdx/memory.h" #include "mongo/unittest/unittest.h" namespace mongo { |