diff options
author | ADAM David Alan Martin <adam.martin@10gen.com> | 2019-06-10 01:18:23 -0400 |
---|---|---|
committer | ADAM David Alan Martin <adam.martin@10gen.com> | 2019-06-10 01:18:23 -0400 |
commit | c9548e729c8fecd9d7a9a5dd341da0433194ac73 (patch) | |
tree | 37b05114182d8a7787c0b39aa71b0ec381292e85 /src/mongo/db/storage/wiredtiger | |
parent | c43636652fc4fb69a47f4eaaa767bc57bb59bb5f (diff) | |
download | mongo-c9548e729c8fecd9d7a9a5dd341da0433194ac73.tar.gz |
SERVER-39338 Remove `stdx/functional.h`
Diffstat (limited to 'src/mongo/db/storage/wiredtiger')
-rw-r--r-- | src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp | 4 | ||||
-rw-r--r-- | src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h | 4 |
2 files changed, 4 insertions, 4 deletions
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. |