diff options
Diffstat (limited to 'src/mongo/db/storage/ephemeral_for_test')
6 files changed, 21 insertions, 19 deletions
diff --git a/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_btree_impl.cpp b/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_btree_impl.cpp index fef05e67b96..d9fa673dba5 100644 --- a/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_btree_impl.cpp +++ b/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_btree_impl.cpp @@ -31,12 +31,12 @@ #include "mongo/db/storage/ephemeral_for_test/ephemeral_for_test_btree_impl.h" +#include <memory> #include <set> #include "mongo/db/catalog/index_catalog_entry.h" #include "mongo/db/storage/ephemeral_for_test/ephemeral_for_test_recovery_unit.h" #include "mongo/db/storage/index_entry_comparison.h" -#include "mongo/stdx/memory.h" #include "mongo/util/str.h" namespace mongo { @@ -481,7 +481,7 @@ public: virtual std::unique_ptr<SortedDataInterface::Cursor> newCursor(OperationContext* opCtx, bool isForward) const { - return stdx::make_unique<Cursor>(opCtx, *_data, isForward, _isUnique); + return std::make_unique<Cursor>(opCtx, *_data, isForward, _isUnique); } virtual Status initAsEmpty(OperationContext* opCtx) { diff --git a/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_btree_impl_test.cpp b/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_btree_impl_test.cpp index ad0b5b12d71..a2c4cfcd857 100644 --- a/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_btree_impl_test.cpp +++ b/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_btree_impl_test.cpp @@ -29,11 +29,11 @@ #include "mongo/db/storage/ephemeral_for_test/ephemeral_for_test_btree_impl.h" +#include <memory> #include "mongo/base/init.h" #include "mongo/db/storage/ephemeral_for_test/ephemeral_for_test_recovery_unit.h" #include "mongo/db/storage/sorted_data_interface_test_harness.h" -#include "mongo/stdx/memory.h" #include "mongo/unittest/unittest.h" namespace mongo { @@ -55,7 +55,7 @@ public: } std::unique_ptr<RecoveryUnit> newRecoveryUnit() final { - return stdx::make_unique<EphemeralForTestRecoveryUnit>(); + return std::make_unique<EphemeralForTestRecoveryUnit>(); } private: @@ -64,7 +64,7 @@ private: }; std::unique_ptr<HarnessHelper> makeHarnessHelper() { - return stdx::make_unique<EphemeralForBtreeImplTestHarnessHelper>(); + return std::make_unique<EphemeralForBtreeImplTestHarnessHelper>(); } MONGO_INITIALIZER(RegisterHarnessFactory)(InitializerContext* const) { diff --git a/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_engine.cpp b/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_engine.cpp index 1c3d233d1cc..782c425ffd0 100644 --- a/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_engine.cpp +++ b/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_engine.cpp @@ -38,7 +38,6 @@ #include "mongo/db/storage/ephemeral_for_test/ephemeral_for_test_record_store.h" #include "mongo/db/storage/ephemeral_for_test/ephemeral_for_test_recovery_unit.h" #include "mongo/db/storage/journal_listener.h" -#include "mongo/stdx/memory.h" namespace mongo { @@ -65,14 +64,14 @@ std::unique_ptr<RecordStore> EphemeralForTestEngine::getRecordStore( OperationContext* opCtx, StringData ns, StringData ident, const CollectionOptions& options) { stdx::lock_guard<stdx::mutex> lk(_mutex); if (options.capped) { - return stdx::make_unique<EphemeralForTestRecordStore>( + return std::make_unique<EphemeralForTestRecordStore>( ns, &_dataMap[ident], true, options.cappedSize ? options.cappedSize : kDefaultCappedSizeBytes, options.cappedMaxDocs ? options.cappedMaxDocs : -1); } else { - return stdx::make_unique<EphemeralForTestRecordStore>(ns, &_dataMap[ident]); + return std::make_unique<EphemeralForTestRecordStore>(ns, &_dataMap[ident]); } } @@ -80,7 +79,7 @@ std::unique_ptr<RecordStore> EphemeralForTestEngine::makeTemporaryRecordStore( OperationContext* opCtx, StringData ident) { stdx::lock_guard<stdx::mutex> lk(_mutex); _dataMap[ident] = {}; - return stdx::make_unique<EphemeralForTestRecordStore>(ident, &_dataMap[ident]); + return std::make_unique<EphemeralForTestRecordStore>(ident, &_dataMap[ident]); } Status EphemeralForTestEngine::createSortedDataInterface(OperationContext* opCtx, diff --git a/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_engine_test.cpp b/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_engine_test.cpp index b017a2cf7bf..ffdc4adee09 100644 --- a/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_engine_test.cpp +++ b/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_engine_test.cpp @@ -29,9 +29,10 @@ #include "mongo/db/storage/ephemeral_for_test/ephemeral_for_test_engine.h" +#include <memory> + #include "mongo/base/init.h" #include "mongo/db/storage/kv/kv_engine_test_harness.h" -#include "mongo/stdx/memory.h" namespace mongo { namespace { @@ -55,7 +56,7 @@ private: }; std::unique_ptr<KVHarnessHelper> makeHelper() { - return stdx::make_unique<EphemeralForTestKVHarnessHelper>(); + return std::make_unique<EphemeralForTestKVHarnessHelper>(); } MONGO_INITIALIZER(RegisterKVHarnessFactory)(InitializerContext*) { diff --git a/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_record_store.cpp b/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_record_store.cpp index 3ce3af87357..7002b7d23b8 100644 --- a/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_record_store.cpp +++ b/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_record_store.cpp @@ -31,12 +31,13 @@ #include "mongo/db/storage/ephemeral_for_test/ephemeral_for_test_record_store.h" +#include <memory> + #include "mongo/db/jsobj.h" #include "mongo/db/namespace_string.h" #include "mongo/db/operation_context.h" #include "mongo/db/storage/oplog_hack.h" #include "mongo/db/storage/recovery_unit.h" -#include "mongo/stdx/memory.h" #include "mongo/util/log.h" #include "mongo/util/str.h" #include "mongo/util/unowned_ptr.h" @@ -545,8 +546,8 @@ StatusWith<RecordData> EphemeralForTestRecordStore::updateWithDamages( std::unique_ptr<SeekableRecordCursor> EphemeralForTestRecordStore::getCursor( OperationContext* opCtx, bool forward) const { if (forward) - return stdx::make_unique<Cursor>(opCtx, *this); - return stdx::make_unique<ReverseCursor>(opCtx, *this); + return std::make_unique<Cursor>(opCtx, *this); + return std::make_unique<ReverseCursor>(opCtx, *this); } Status EphemeralForTestRecordStore::truncate(OperationContext* opCtx) { diff --git a/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_record_store_test.cpp b/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_record_store_test.cpp index 1d09b16acdb..f677d4575c9 100644 --- a/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_record_store_test.cpp +++ b/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_record_store_test.cpp @@ -31,10 +31,11 @@ #include "mongo/db/storage/ephemeral_for_test/ephemeral_for_test_record_store.h" +#include <memory> + #include "mongo/base/init.h" #include "mongo/db/storage/ephemeral_for_test/ephemeral_for_test_recovery_unit.h" #include "mongo/db/storage/record_store_test_harness.h" -#include "mongo/stdx/memory.h" #include "mongo/unittest/unittest.h" namespace mongo { @@ -49,7 +50,7 @@ public: } virtual std::unique_ptr<RecordStore> newNonCappedRecordStore(const std::string& ns) { - return stdx::make_unique<EphemeralForTestRecordStore>(ns, &data); + return std::make_unique<EphemeralForTestRecordStore>(ns, &data); } virtual std::unique_ptr<RecordStore> newCappedRecordStore(int64_t cappedSizeBytes, @@ -60,12 +61,12 @@ public: virtual std::unique_ptr<RecordStore> newCappedRecordStore(const std::string& ns, int64_t cappedSizeBytes, int64_t cappedMaxDocs) final { - return stdx::make_unique<EphemeralForTestRecordStore>( + return std::make_unique<EphemeralForTestRecordStore>( ns, &data, true, cappedSizeBytes, cappedMaxDocs); } std::unique_ptr<RecoveryUnit> newRecoveryUnit() final { - return stdx::make_unique<EphemeralForTestRecoveryUnit>(); + return std::make_unique<EphemeralForTestRecoveryUnit>(); } bool supportsDocLocking() final { @@ -76,7 +77,7 @@ public: }; std::unique_ptr<HarnessHelper> makeHarnessHelper() { - return stdx::make_unique<EphemeralForTestHarnessHelper>(); + return std::make_unique<EphemeralForTestHarnessHelper>(); } MONGO_INITIALIZER(RegisterHarnessFactory)(InitializerContext* const) { |