From e08a2b387a0b00534cc229702c6f358cb02870ac Mon Sep 17 00:00:00 2001
From: Yash Tibrewal <yashkt@google.com>
Date: Fri, 2 Nov 2018 15:48:57 -0700
Subject: [PATCH] Prefer lambda expressions over std::bind

---
 src/cpp/client/secure_credentials.cc        |  7 ++++---
 src/cpp/server/secure_server_credentials.cc |  7 ++++---
 src/cpp/server/server_cc.cc                 | 10 ++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/cpp/client/secure_credentials.cc b/src/cpp/client/secure_credentials.cc
index d1cd78e755c..ea0f43fc3e5 100644
--- a/src/cpp/client/secure_credentials.cc
+++ b/src/cpp/client/secure_credentials.cc
@@ -228,9 +228,10 @@ int MetadataCredentialsPluginWrapper::GetMetadata(
   }
   if (w->plugin_->IsBlocking()) {
     // Asynchronous return.
-    w->thread_pool_->Add(
-        std::bind(&MetadataCredentialsPluginWrapper::InvokePlugin, w, context,
-                  cb, user_data, nullptr, nullptr, nullptr, nullptr));
+    w->thread_pool_->Add([=]() {
+      w->MetadataCredentialsPluginWrapper::InvokePlugin(
+          context, cb, user_data, nullptr, nullptr, nullptr, nullptr);
+    });
     return 0;
   } else {
     // Synchronous return.
diff --git a/src/cpp/server/secure_server_credentials.cc b/src/cpp/server/secure_server_credentials.cc
index 536bf022dde..4911cd6eff2 100644
--- a/src/cpp/server/secure_server_credentials.cc
+++ b/src/cpp/server/secure_server_credentials.cc
@@ -43,9 +43,10 @@ void AuthMetadataProcessorAyncWrapper::Process(
     return;
   }
   if (w->processor_->IsBlocking()) {
-    w->thread_pool_->Add(
-        std::bind(&AuthMetadataProcessorAyncWrapper::InvokeProcessor, w,
-                  context, md, num_md, cb, user_data));
+    w->thread_pool_->Add([=]() {
+      w->AuthMetadataProcessorAyncWrapper::InvokeProcessor(context, md, num_md,
+                                                           cb, user_data);
+    });
   } else {
     // invoke directly.
     w->InvokeProcessor(context, md, num_md, cb, user_data);
diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc
index 870ee84e3e5..c031528a8f3 100644
--- a/src/cpp/server/server_cc.cc
+++ b/src/cpp/server/server_cc.cc
@@ -268,8 +268,8 @@ class Server::SyncRequest final : public internal::CompletionQueueTag {
         interceptor_methods_.SetRecvMessage(request_);
       }
 
-      auto f = std::bind(&CallData::ContinueRunAfterInterception, this);
-      if (interceptor_methods_.RunInterceptors(f)) {
+      if (interceptor_methods_.RunInterceptors(
+              [this]() { ContinueRunAfterInterception(); })) {
         ContinueRunAfterInterception();
       } else {
         // There were interceptors to be run, so ContinueRunAfterInterception
@@ -981,10 +981,8 @@ bool ServerInterface::BaseAsyncRequest::FinalizeResult(void** tag,
     interceptor_methods_.AddInterceptionHookPoint(
         experimental::InterceptionHookPoints::POST_RECV_INITIAL_METADATA);
     interceptor_methods_.SetRecvInitialMetadata(&context_->client_metadata_);
-    auto f = std::bind(&ServerInterface::BaseAsyncRequest::
-                           ContinueFinalizeResultAfterInterception,
-                       this);
-    if (interceptor_methods_.RunInterceptors(f)) {
+    if (interceptor_methods_.RunInterceptors(
+            [this]() { ContinueFinalizeResultAfterInterception(); })) {
       // There are no interceptors to run. Continue
     } else {
       // There were interceptors to be run, so