diff options
Diffstat (limited to 'src/mongo/db/storage/kv')
9 files changed, 13 insertions, 13 deletions
diff --git a/src/mongo/db/storage/kv/kv_catalog.cpp b/src/mongo/db/storage/kv/kv_catalog.cpp index a102a8707d4..b9922cea3f9 100644 --- a/src/mongo/db/storage/kv/kv_catalog.cpp +++ b/src/mongo/db/storage/kv/kv_catalog.cpp @@ -31,6 +31,7 @@ #include "mongo/db/storage/kv/kv_catalog.h" +#include <memory> #include <stdlib.h> #include "mongo/bson/util/bson_extract.h" @@ -47,7 +48,6 @@ #include "mongo/db/storage/recovery_unit.h" #include "mongo/platform/bits.h" #include "mongo/platform/random.h" -#include "mongo/stdx/memory.h" #include "mongo/util/log.h" #include "mongo/util/str.h" diff --git a/src/mongo/db/storage/kv/kv_catalog_feature_tracker_test.cpp b/src/mongo/db/storage/kv/kv_catalog_feature_tracker_test.cpp index c7106a14ab0..b9ad41eff8d 100644 --- a/src/mongo/db/storage/kv/kv_catalog_feature_tracker_test.cpp +++ b/src/mongo/db/storage/kv/kv_catalog_feature_tracker_test.cpp @@ -31,11 +31,12 @@ #include "mongo/db/storage/kv/kv_engine_test_harness.h" +#include <memory> + #include "mongo/db/operation_context_noop.h" #include "mongo/db/storage/kv/kv_catalog_feature_tracker.h" #include "mongo/db/storage/kv/kv_engine.h" #include "mongo/db/storage/record_store.h" -#include "mongo/stdx/memory.h" #include "mongo/unittest/unittest.h" namespace mongo { @@ -66,7 +67,7 @@ public: KVCatalogFeatureTrackerTest() : _helper(KVHarnessHelper::create()) {} std::unique_ptr<OperationContext> newOperationContext() { - return stdx::make_unique<OperationContextNoop>(_helper->getEngine()->newRecoveryUnit()); + return std::make_unique<OperationContextNoop>(_helper->getEngine()->newRecoveryUnit()); } void setUp() final { @@ -80,7 +81,7 @@ public: wuow.commit(); } - _catalog = stdx::make_unique<KVCatalog>(_rs.get(), false, false, nullptr); + _catalog = std::make_unique<KVCatalog>(_rs.get(), false, false, nullptr); _catalog->init(opCtx.get()); { diff --git a/src/mongo/db/storage/kv/kv_collection_catalog_entry_test.cpp b/src/mongo/db/storage/kv/kv_collection_catalog_entry_test.cpp index c4eee897176..744dd3818a2 100644 --- a/src/mongo/db/storage/kv/kv_collection_catalog_entry_test.cpp +++ b/src/mongo/db/storage/kv/kv_collection_catalog_entry_test.cpp @@ -69,7 +69,7 @@ public: } std::unique_ptr<OperationContext> newOperationContext() { - auto opCtx = stdx::make_unique<OperationContextNoop>(&cc(), 0); + auto opCtx = std::make_unique<OperationContextNoop>(&cc(), 0); opCtx->setRecoveryUnit(std::unique_ptr<RecoveryUnit>(_storageEngine.newRecoveryUnit()), WriteUnitOfWork::RecoveryUnitState::kNotInUnitOfWork); return opCtx; diff --git a/src/mongo/db/storage/kv/kv_drop_pending_ident_reaper_test.cpp b/src/mongo/db/storage/kv/kv_drop_pending_ident_reaper_test.cpp index 4801bc2c1dd..e5fad9811a5 100644 --- a/src/mongo/db/storage/kv/kv_drop_pending_ident_reaper_test.cpp +++ b/src/mongo/db/storage/kv/kv_drop_pending_ident_reaper_test.cpp @@ -34,7 +34,6 @@ #include "mongo/db/concurrency/lock_state.h" #include "mongo/db/service_context_test_fixture.h" #include "mongo/db/storage/kv/kv_drop_pending_ident_reaper.h" -#include "mongo/stdx/memory.h" #include "mongo/unittest/death_test.h" #include "mongo/unittest/unittest.h" @@ -173,7 +172,7 @@ void KVDropPendingIdentReaperTest::setUp() { ServiceContextTest::setUp(); auto service = getServiceContext(); service->registerClientObserver(std::make_unique<ReaperTestClientObserver>()); - _engineMock = stdx::make_unique<KVEngineMock>(); + _engineMock = std::make_unique<KVEngineMock>(); } void KVDropPendingIdentReaperTest::tearDown() { _engineMock = {}; diff --git a/src/mongo/db/storage/kv/kv_engine_test_harness.cpp b/src/mongo/db/storage/kv/kv_engine_test_harness.cpp index 6ed9e6c9299..1485bacf687 100644 --- a/src/mongo/db/storage/kv/kv_engine_test_harness.cpp +++ b/src/mongo/db/storage/kv/kv_engine_test_harness.cpp @@ -57,7 +57,7 @@ public: MyOperationContext(KVEngine* engine) : OperationContextNoop(engine->newRecoveryUnit()) {} }; -const std::unique_ptr<ClockSource> clock = stdx::make_unique<ClockSourceMock>(); +const std::unique_ptr<ClockSource> clock = std::make_unique<ClockSourceMock>(); TEST(KVEngineTestHarness, SimpleRS1) { unique_ptr<KVHarnessHelper> helper(KVHarnessHelper::create()); @@ -636,7 +636,7 @@ TEST_F(KVCatalogTest, RestartForPrefixes) { unique_ptr<RecordStore> rs = engine->getRecordStore(&opCtx, "catalog", "catalog", CollectionOptions()); unique_ptr<KVCatalog> catalog = - stdx::make_unique<KVCatalog>(rs.get(), false, false, nullptr); + std::make_unique<KVCatalog>(rs.get(), false, false, nullptr); catalog->init(&opCtx); const BSONCollectionCatalogEntry::MetaData md = diff --git a/src/mongo/db/storage/kv/kv_engine_timestamps_test.cpp b/src/mongo/db/storage/kv/kv_engine_timestamps_test.cpp index 30a3df2e4ca..aeef71561ae 100644 --- a/src/mongo/db/storage/kv/kv_engine_timestamps_test.cpp +++ b/src/mongo/db/storage/kv/kv_engine_timestamps_test.cpp @@ -40,7 +40,6 @@ #include "mongo/db/storage/kv/kv_engine.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/snapshot_manager.h" -#include "mongo/stdx/memory.h" #include "mongo/unittest/unittest.h" #include "mongo/util/clock_source_mock.h" diff --git a/src/mongo/db/storage/kv/kv_storage_engine.h b/src/mongo/db/storage/kv/kv_storage_engine.h index 14360bb7700..e75f5271f8b 100644 --- a/src/mongo/db/storage/kv/kv_storage_engine.h +++ b/src/mongo/db/storage/kv/kv_storage_engine.h @@ -31,6 +31,7 @@ #include <functional> #include <map> +#include <memory> #include <string> #include "mongo/base/status_with.h" @@ -45,7 +46,6 @@ #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/storage_engine.h" #include "mongo/db/storage/temporary_record_store.h" -#include "mongo/stdx/memory.h" #include "mongo/stdx/mutex.h" #include "mongo/util/periodic_runner.h" diff --git a/src/mongo/db/storage/kv/kv_storage_engine_test.cpp b/src/mongo/db/storage/kv/kv_storage_engine_test.cpp index 370677f8f1c..554793f9f79 100644 --- a/src/mongo/db/storage/kv/kv_storage_engine_test.cpp +++ b/src/mongo/db/storage/kv/kv_storage_engine_test.cpp @@ -29,6 +29,8 @@ #include "mongo/platform/basic.h" +#include <memory> + #include "mongo/base/checked_cast.h" #include "mongo/base/status_with.h" #include "mongo/bson/bsonobjbuilder.h" @@ -48,7 +50,6 @@ #include "mongo/db/storage/kv/kv_storage_engine_test_fixture.h" #include "mongo/db/storage/storage_repair_observer.h" #include "mongo/db/unclean_shutdown.h" -#include "mongo/stdx/memory.h" #include "mongo/unittest/barrier.h" #include "mongo/unittest/unittest.h" #include "mongo/util/periodic_runner_factory.h" diff --git a/src/mongo/db/storage/kv/kv_storage_engine_test_fixture.h b/src/mongo/db/storage/kv/kv_storage_engine_test_fixture.h index 2b704e7b4e5..54e2f3a54d0 100644 --- a/src/mongo/db/storage/kv/kv_storage_engine_test_fixture.h +++ b/src/mongo/db/storage/kv/kv_storage_engine_test_fixture.h @@ -131,7 +131,7 @@ public: BSONObj spec = builder.append("name", key).append("ns", collNs.ns()).append("v", 2).done(); auto descriptor = - stdx::make_unique<IndexDescriptor>(coll, IndexNames::findPluginName(spec), spec); + std::make_unique<IndexDescriptor>(coll, IndexNames::findPluginName(spec), spec); CollectionCatalogEntry* cce = CollectionCatalog::get(opCtx).lookupCollectionCatalogEntryByNamespace(collNs); |