Merge pull request #10195 from vespa-engine/toregge/use-std-mem-fn-and-std-bind

Use std::mem_fn instead of std::mem_fun.

2 files changed, 4 insertions, 4 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;
     }
diff --git a/searchlib/src/vespa/searchlib/queryeval/simple_phrase_search.cpp b/searchlib/src/vespa/searchlib/queryeval/simple_phrase_search.cpp
index 4289f47cea7..9e449f16f68 100644
--- a/searchlib/src/vespa/searchlib/queryeval/simple_phrase_search.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/simple_phrase_search.cpp
@@ -8,7 +8,6 @@
 
 using search::fef::TermFieldMatchData;
 using std::unique_ptr;
-using std::mem_fun_ref;
 using std::transform;
 using std::vector;
 using vespalib::ObjectVisitor;