diff options
Diffstat (limited to 'src/mongo/db/query/collation')
7 files changed, 18 insertions, 13 deletions
diff --git a/src/mongo/db/query/collation/collation_index_key.cpp b/src/mongo/db/query/collation/collation_index_key.cpp index 3af408e8abd..48d971d3f7e 100644 --- a/src/mongo/db/query/collation/collation_index_key.cpp +++ b/src/mongo/db/query/collation/collation_index_key.cpp @@ -31,13 +31,13 @@ #include "mongo/db/query/collation/collation_index_key.h" +#include <memory> #include <stack> #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/util/builder.h" #include "mongo/db/query/collation/collator_interface.h" -#include "mongo/stdx/memory.h" #include "mongo/util/assert_util.h" namespace mongo { diff --git a/src/mongo/db/query/collation/collator_factory_icu.cpp b/src/mongo/db/query/collation/collator_factory_icu.cpp index c8b8de7a5ab..f9662b0a22a 100644 --- a/src/mongo/db/query/collation/collator_factory_icu.cpp +++ b/src/mongo/db/query/collation/collator_factory_icu.cpp @@ -31,6 +31,8 @@ #include "mongo/db/query/collation/collator_factory_icu.h" +#include <memory> + #include <unicode/coll.h> #include <unicode/errorcode.h> #include <unicode/ucol.h> @@ -39,7 +41,6 @@ #include "mongo/bson/bsonobj.h" #include "mongo/bson/util/bson_extract.h" #include "mongo/db/query/collation/collator_interface_icu.h" -#include "mongo/stdx/memory.h" #include "mongo/util/str.h" namespace mongo { @@ -754,8 +755,8 @@ StatusWith<std::unique_ptr<CollatorInterface>> CollatorFactoryICU::makeFromBSON( return validateSpecStatus; } - auto mongoCollator = stdx::make_unique<CollatorInterfaceICU>(std::move(parsedSpec.getValue()), - std::move(icuCollator)); + auto mongoCollator = std::make_unique<CollatorInterfaceICU>(std::move(parsedSpec.getValue()), + std::move(icuCollator)); return {std::move(mongoCollator)}; } diff --git a/src/mongo/db/query/collation/collator_factory_icu_decoration.cpp b/src/mongo/db/query/collation/collator_factory_icu_decoration.cpp index df6233398ba..654f4f4c7b3 100644 --- a/src/mongo/db/query/collation/collator_factory_icu_decoration.cpp +++ b/src/mongo/db/query/collation/collator_factory_icu_decoration.cpp @@ -29,10 +29,11 @@ #include "mongo/platform/basic.h" +#include <memory> + #include "mongo/base/init.h" #include "mongo/db/query/collation/collator_factory_icu.h" #include "mongo/db/service_context.h" -#include "mongo/stdx/memory.h" namespace mongo { @@ -42,7 +43,7 @@ ServiceContext::ConstructorActionRegisterer registerIcuCollator{ "CreateCollatorFactory", {"LoadICUData"}, [](ServiceContext* service) { - CollatorFactoryInterface::set(service, stdx::make_unique<CollatorFactoryICU>()); + CollatorFactoryInterface::set(service, std::make_unique<CollatorFactoryICU>()); }}; } // namespace diff --git a/src/mongo/db/query/collation/collator_factory_icu_test.cpp b/src/mongo/db/query/collation/collator_factory_icu_test.cpp index 052e03decee..7024303dffd 100644 --- a/src/mongo/db/query/collation/collator_factory_icu_test.cpp +++ b/src/mongo/db/query/collation/collator_factory_icu_test.cpp @@ -31,9 +31,10 @@ #include "mongo/db/query/collation/collator_factory_icu.h" +#include <memory> + #include "mongo/base/init.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/stdx/memory.h" #include "mongo/unittest/unittest.h" namespace { diff --git a/src/mongo/db/query/collation/collator_factory_mock.cpp b/src/mongo/db/query/collation/collator_factory_mock.cpp index e273572ff95..cc82e36522a 100644 --- a/src/mongo/db/query/collation/collator_factory_mock.cpp +++ b/src/mongo/db/query/collation/collator_factory_mock.cpp @@ -31,12 +31,13 @@ #include "mongo/db/query/collation/collator_factory_mock.h" +#include <memory> + #include "mongo/base/status_with.h" #include "mongo/bson/bsonobj.h" #include "mongo/bson/bsonobjbuilder.h" #include "mongo/bson/simple_bsonobj_comparator.h" #include "mongo/db/query/collation/collator_interface_mock.h" -#include "mongo/stdx/memory.h" namespace mongo { @@ -46,7 +47,7 @@ StatusWith<std::unique_ptr<CollatorInterface>> CollatorFactoryMock::makeFromBSON return {nullptr}; } auto collator = - stdx::make_unique<CollatorInterfaceMock>(CollatorInterfaceMock::MockType::kReverseString); + std::make_unique<CollatorInterfaceMock>(CollatorInterfaceMock::MockType::kReverseString); return {std::move(collator)}; } diff --git a/src/mongo/db/query/collation/collator_interface_icu.cpp b/src/mongo/db/query/collation/collator_interface_icu.cpp index 28fcce5db7d..db35958c63a 100644 --- a/src/mongo/db/query/collation/collator_interface_icu.cpp +++ b/src/mongo/db/query/collation/collator_interface_icu.cpp @@ -31,10 +31,11 @@ #include "mongo/db/query/collation/collator_interface_icu.h" +#include <memory> + #include <unicode/coll.h> #include <unicode/sortkey.h> -#include "mongo/stdx/memory.h" #include "mongo/util/assert_util.h" namespace mongo { @@ -44,7 +45,7 @@ CollatorInterfaceICU::CollatorInterfaceICU(CollationSpec spec, : CollatorInterface(std::move(spec)), _collator(std::move(collator)) {} std::unique_ptr<CollatorInterface> CollatorInterfaceICU::clone() const { - auto clone = stdx::make_unique<CollatorInterfaceICU>( + auto clone = std::make_unique<CollatorInterfaceICU>( getSpec(), std::unique_ptr<icu::Collator>(_collator->clone())); return {std::move(clone)}; } diff --git a/src/mongo/db/query/collation/collator_interface_mock.cpp b/src/mongo/db/query/collation/collator_interface_mock.cpp index 405262bfb75..0ace0847984 100644 --- a/src/mongo/db/query/collation/collator_interface_mock.cpp +++ b/src/mongo/db/query/collation/collator_interface_mock.cpp @@ -33,9 +33,9 @@ #include <algorithm> #include <cctype> +#include <memory> #include <string> -#include "mongo/stdx/memory.h" #include "mongo/util/assert_util.h" namespace mongo { @@ -62,7 +62,7 @@ CollatorInterfaceMock::CollatorInterfaceMock(MockType mockType) _mockType(mockType) {} std::unique_ptr<CollatorInterface> CollatorInterfaceMock::clone() const { - auto clone = stdx::make_unique<CollatorInterfaceMock>(_mockType); + auto clone = std::make_unique<CollatorInterfaceMock>(_mockType); return {std::move(clone)}; } |