diff options
Diffstat (limited to 'src/mongo/db/storage')
14 files changed, 25 insertions, 25 deletions
diff --git a/src/mongo/db/storage/biggie/biggie_recovery_unit.cpp b/src/mongo/db/storage/biggie/biggie_recovery_unit.cpp index cd7026562a6..67479c0ea74 100644 --- a/src/mongo/db/storage/biggie/biggie_recovery_unit.cpp +++ b/src/mongo/db/storage/biggie/biggie_recovery_unit.cpp @@ -40,7 +40,7 @@ namespace mongo { namespace biggie { -RecoveryUnit::RecoveryUnit(KVEngine* parentKVEngine, stdx::function<void()> cb) +RecoveryUnit::RecoveryUnit(KVEngine* parentKVEngine, std::function<void()> cb) : _waitUntilDurableCallback(cb), _KVEngine(parentKVEngine) {} RecoveryUnit::~RecoveryUnit() { diff --git a/src/mongo/db/storage/biggie/biggie_recovery_unit.h b/src/mongo/db/storage/biggie/biggie_recovery_unit.h index 1db70102318..33403656f4a 100644 --- a/src/mongo/db/storage/biggie/biggie_recovery_unit.h +++ b/src/mongo/db/storage/biggie/biggie_recovery_unit.h @@ -29,20 +29,20 @@ #pragma once +#include <functional> #include <vector> #include "mongo/db/record_id.h" #include "mongo/db/storage/biggie/biggie_kv_engine.h" #include "mongo/db/storage/biggie/store.h" #include "mongo/db/storage/recovery_unit.h" -#include "mongo/stdx/functional.h" namespace mongo { namespace biggie { class RecoveryUnit : public ::mongo::RecoveryUnit { public: - RecoveryUnit(KVEngine* parentKVEngine, stdx::function<void()> cb = nullptr); + RecoveryUnit(KVEngine* parentKVEngine, std::function<void()> cb = nullptr); ~RecoveryUnit(); void beginUnitOfWork(OperationContext* opCtx) override final; @@ -80,7 +80,7 @@ public: private: void _abort(); - stdx::function<void()> _waitUntilDurableCallback; + std::function<void()> _waitUntilDurableCallback; // Official master is kept by KVEngine KVEngine* _KVEngine; StringStore _mergeBase; diff --git a/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_recovery_unit.h b/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_recovery_unit.h index 4f2e11ead6e..7d5f7bf607a 100644 --- a/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_recovery_unit.h +++ b/src/mongo/db/storage/ephemeral_for_test/ephemeral_for_test_recovery_unit.h @@ -29,11 +29,11 @@ #pragma once +#include <functional> #include <vector> #include "mongo/db/record_id.h" #include "mongo/db/storage/recovery_unit.h" -#include "mongo/stdx/functional.h" namespace mongo { @@ -41,7 +41,7 @@ class SortedDataInterface; class EphemeralForTestRecoveryUnit : public RecoveryUnit { public: - EphemeralForTestRecoveryUnit(stdx::function<void()> cb = nullptr) + EphemeralForTestRecoveryUnit(std::function<void()> cb = nullptr) : _waitUntilDurableCallback(cb) {} void beginUnitOfWork(OperationContext* opCtx) final{}; @@ -96,7 +96,7 @@ private: typedef std::vector<ChangePtr> Changes; Changes _changes; - stdx::function<void()> _waitUntilDurableCallback; + std::function<void()> _waitUntilDurableCallback; Timestamp _prepareTimestamp = Timestamp::min(); Timestamp _commitTimestamp = Timestamp::min(); diff --git a/src/mongo/db/storage/key_string_test.cpp b/src/mongo/db/storage/key_string_test.cpp index 57ce40f4563..bb231aada9f 100644 --- a/src/mongo/db/storage/key_string_test.cpp +++ b/src/mongo/db/storage/key_string_test.cpp @@ -33,6 +33,7 @@ #include <algorithm> #include <cmath> +#include <functional> #include <limits> #include <memory> #include <random> @@ -46,7 +47,6 @@ #include "mongo/config.h" #include "mongo/db/storage/key_string.h" #include "mongo/platform/decimal128.h" -#include "mongo/stdx/functional.h" #include "mongo/stdx/future.h" #include "mongo/stdx/memory.h" #include "mongo/unittest/death_test.h" 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 6cbb5572554..4801bc2c1dd 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 @@ -133,7 +133,7 @@ public: std::vector<std::string> droppedIdents; // Override to modify dropIdent() behavior. - using DropIdentFn = stdx::function<Status(OperationContext*, StringData)>; + using DropIdentFn = std::function<Status(OperationContext*, StringData)>; DropIdentFn dropIdentFn = [](OperationContext*, StringData) { return Status::OK(); }; }; 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 182eba1cd73..6ed9e6c9299 100644 --- a/src/mongo/db/storage/kv/kv_engine_test_harness.cpp +++ b/src/mongo/db/storage/kv/kv_engine_test_harness.cpp @@ -49,7 +49,7 @@ namespace { using std::unique_ptr; using std::string; -stdx::function<std::unique_ptr<KVHarnessHelper>()> basicFactory = +std::function<std::unique_ptr<KVHarnessHelper>()> basicFactory = []() -> std::unique_ptr<KVHarnessHelper> { fassertFailed(40355); }; class MyOperationContext : public OperationContextNoop { @@ -688,7 +688,7 @@ std::unique_ptr<KVHarnessHelper> KVHarnessHelper::create() { return basicFactory(); }; -void KVHarnessHelper::registerFactory(stdx::function<std::unique_ptr<KVHarnessHelper>()> factory) { +void KVHarnessHelper::registerFactory(std::function<std::unique_ptr<KVHarnessHelper>()> factory) { basicFactory = std::move(factory); }; diff --git a/src/mongo/db/storage/kv/kv_engine_test_harness.h b/src/mongo/db/storage/kv/kv_engine_test_harness.h index fda7a4ae6d8..ed2f5d66d14 100644 --- a/src/mongo/db/storage/kv/kv_engine_test_harness.h +++ b/src/mongo/db/storage/kv/kv_engine_test_harness.h @@ -29,10 +29,10 @@ #pragma once +#include <functional> #include <memory> #include "mongo/db/storage/kv/kv_engine.h" -#include "mongo/stdx/functional.h" namespace mongo { @@ -56,7 +56,7 @@ public: virtual KVEngine* restartEngine() = 0; static std::unique_ptr<KVHarnessHelper> create(); - static void registerFactory(stdx::function<std::unique_ptr<KVHarnessHelper>()> factory); + static void registerFactory(std::function<std::unique_ptr<KVHarnessHelper>()> factory); }; } // namespace mongo diff --git a/src/mongo/db/storage/kv/kv_storage_engine.h b/src/mongo/db/storage/kv/kv_storage_engine.h index 263c5cdde9e..14360bb7700 100644 --- a/src/mongo/db/storage/kv/kv_storage_engine.h +++ b/src/mongo/db/storage/kv/kv_storage_engine.h @@ -29,6 +29,7 @@ #pragma once +#include <functional> #include <map> #include <string> @@ -44,7 +45,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/functional.h" #include "mongo/stdx/memory.h" #include "mongo/stdx/mutex.h" #include "mongo/util/periodic_runner.h" @@ -188,7 +188,7 @@ public: class TimestampListener { public: // Caller must ensure that the lifetime of the variables used in the callback are valid. - using Callback = stdx::function<void(Timestamp timestamp)>; + using Callback = std::function<void(Timestamp timestamp)>; /** * A TimestampListener saves a 'callback' that will be executed whenever the specified diff --git a/src/mongo/db/storage/storage_engine_init.cpp b/src/mongo/db/storage/storage_engine_init.cpp index fd7701b8c8d..66805071ca2 100644 --- a/src/mongo/db/storage/storage_engine_init.cpp +++ b/src/mongo/db/storage/storage_engine_init.cpp @@ -283,7 +283,7 @@ StorageEngine::Factory* getFactoryForStorageEngine(ServiceContext* service, Stri Status validateStorageOptions( ServiceContext* service, const BSONObj& storageEngineOptions, - stdx::function<Status(const StorageEngine::Factory* const, const BSONObj&)> validateFunc) { + std::function<Status(const StorageEngine::Factory* const, const BSONObj&)> validateFunc) { BSONObjIterator storageIt(storageEngineOptions); while (storageIt.more()) { diff --git a/src/mongo/db/storage/storage_engine_init.h b/src/mongo/db/storage/storage_engine_init.h index 793c698b74b..87d3af190ae 100644 --- a/src/mongo/db/storage/storage_engine_init.h +++ b/src/mongo/db/storage/storage_engine_init.h @@ -87,7 +87,7 @@ StorageEngine::Factory* getFactoryForStorageEngine(ServiceContext* context, Stri Status validateStorageOptions( ServiceContext* service, const BSONObj& storageEngineOptions, - stdx::function<Status(const StorageEngine::Factory* const, const BSONObj&)> validateFunc); + std::function<Status(const StorageEngine::Factory* const, const BSONObj&)> validateFunc); /* * Appends a the list of available storage engines to a BSONObjBuilder for reporting purposes. diff --git a/src/mongo/db/storage/test_harness_helper.cpp b/src/mongo/db/storage/test_harness_helper.cpp index 7391e6ea500..716029669a9 100644 --- a/src/mongo/db/storage/test_harness_helper.cpp +++ b/src/mongo/db/storage/test_harness_helper.cpp @@ -36,12 +36,12 @@ namespace mongo { namespace { -stdx::function<std::unique_ptr<HarnessHelper>()> basicHarnessFactory; +std::function<std::unique_ptr<HarnessHelper>()> basicHarnessFactory; } // namespace HarnessHelper::HarnessHelper() : _threadClient(getGlobalServiceContext()) {} -void registerHarnessHelperFactory(stdx::function<std::unique_ptr<HarnessHelper>()> factory) { +void registerHarnessHelperFactory(std::function<std::unique_ptr<HarnessHelper>()> factory) { basicHarnessFactory = std::move(factory); } diff --git a/src/mongo/db/storage/test_harness_helper.h b/src/mongo/db/storage/test_harness_helper.h index 2a04a8b773c..fb0d1974b1a 100644 --- a/src/mongo/db/storage/test_harness_helper.h +++ b/src/mongo/db/storage/test_harness_helper.h @@ -30,6 +30,7 @@ #pragma once #include <cstdint> +#include <functional> #include <initializer_list> #include <memory> @@ -39,7 +40,6 @@ #include "mongo/db/service_context.h" #include "mongo/db/service_context_test_fixture.h" #include "mongo/db/storage/sorted_data_interface.h" -#include "mongo/stdx/functional.h" #include "mongo/stdx/memory.h" #include "mongo/util/unowned_ptr.h" @@ -95,7 +95,7 @@ std::unique_ptr<Target> noexcept_ptr_conversion(std::unique_ptr<Current>&& p, Ta } } // namespace harness_helper_detail -extern void registerHarnessHelperFactory(stdx::function<std::unique_ptr<HarnessHelper>()> factory); +extern void registerHarnessHelperFactory(std::function<std::unique_ptr<HarnessHelper>()> factory); template <typename Target, typename Current> std::unique_ptr<Target> dynamic_ptr_cast(std::unique_ptr<Current>&& p) { diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp index da7eeac9fb4..2c6728dfe88 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp @@ -501,7 +501,7 @@ Status OpenReadTransactionParam::setFromString(const std::string& str) { namespace { -stdx::function<bool(StringData)> initRsOplogBackgroundThreadCallback = [](StringData) -> bool { +std::function<bool(StringData)> initRsOplogBackgroundThreadCallback = [](StringData) -> bool { fassertFailed(40358); }; @@ -1556,7 +1556,7 @@ void WiredTigerKVEngine::setJournalListener(JournalListener* jl) { } void WiredTigerKVEngine::setInitRsOplogBackgroundThreadCallback( - stdx::function<bool(StringData)> cb) { + std::function<bool(StringData)> cb) { initRsOplogBackgroundThreadCallback = std::move(cb); } diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h index 5ba3224b542..f6b2a7ecb8f 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h @@ -29,6 +29,7 @@ #pragma once +#include <functional> #include <list> #include <memory> #include <string> @@ -43,7 +44,6 @@ #include "mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.h" #include "mongo/db/storage/wiredtiger/wiredtiger_session_cache.h" #include "mongo/db/storage/wiredtiger/wiredtiger_util.h" -#include "mongo/stdx/functional.h" #include "mongo/stdx/mutex.h" #include "mongo/util/elapsed_tracker.h" @@ -295,7 +295,7 @@ public: * background job, for example). Intended to be called from a MONGO_INITIALIZER and therefore in * a single threaded context. */ - static void setInitRsOplogBackgroundThreadCallback(stdx::function<bool(StringData)> cb); + static void setInitRsOplogBackgroundThreadCallback(std::function<bool(StringData)> cb); /** * Initializes a background job to remove excess documents in the oplog collections. |