diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2019-08-06 11:47:17 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-08-06 11:47:17 +0200 |
commit | 094881e0a90338588bd0fa88327015c8d8fd1a04 (patch) | |
tree | 1f60a29ba8c47537d9f52e08abd881623606b1cb /searchcore | |
parent | f8efaab3d1c8116afc1dc2b3cdf65248ede5c58e (diff) |
Use std::mem_fn instead of std::mem_fun.
Use std::bind instead of std::bind2nd.
Diffstat (limited to 'searchcore')
-rw-r--r-- | searchcore/src/vespa/searchcore/fdispatch/program/rpc.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/searchcore/src/vespa/searchcore/fdispatch/program/rpc.cpp b/searchcore/src/vespa/searchcore/fdispatch/program/rpc.cpp index 56301c5e986..df8711adb88 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/program/rpc.cpp +++ b/searchcore/src/vespa/searchcore/fdispatch/program/rpc.cpp @@ -76,7 +76,7 @@ FastS_fdispatch_RPC::RPC_EnableEngine(FRT_RPCRequest *req) cnt += ds_plain->ForEachEngine( ExecuteWhenEqualName(name, - std::mem_fun( &FastS_EngineBase::ClearBad ))) + std::mem_fn( &FastS_EngineBase::ClearBad ))) ._cnt; } @@ -102,8 +102,9 @@ FastS_fdispatch_RPC::RPC_DisableEngine(FRT_RPCRequest *req) uint32_t badness = FastS_EngineBase::BAD_ADMIN; cnt += ds_plain->ForEachEngine( ExecuteWhenEqualName(name, - std::bind2nd( - std::mem_fun( &FastS_EngineBase::MarkBad ), + std::bind( + std::mem_fn( &FastS_EngineBase::MarkBad ), + std::placeholders::_1, badness))) ._cnt; } |