From 231b8639220dc6204ad153469091fff56a730481 Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Wed, 17 Oct 2018 09:29:05 -0700
Subject: [PATCH] address clang-tidy problems

---
 src/cpp/server/health/default_health_check_service.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/cpp/server/health/default_health_check_service.cc b/src/cpp/server/health/default_health_check_service.cc
index d7e1356bde2..0c03fdf17a8 100644
--- a/src/cpp/server/health/default_health_check_service.cc
+++ b/src/cpp/server/health/default_health_check_service.cc
@@ -72,7 +72,8 @@ void DefaultHealthCheckService::RegisterCallHandler(
   std::unique_lock<std::mutex> lock(mu_);
   ServiceData& service_data = services_map_[service_name];
   service_data.AddCallHandler(handler /* copies ref */);
-  handler->SendHealth(std::move(handler), service_data.GetServingStatus());
+  HealthCheckServiceImpl::CallHandler* h = handler.get();
+  h->SendHealth(std::move(handler), service_data.GetServingStatus());
 }
 
 void DefaultHealthCheckService::UnregisterCallHandler(
@@ -115,7 +116,7 @@ void DefaultHealthCheckService::ServiceData::AddCallHandler(
 
 void DefaultHealthCheckService::ServiceData::RemoveCallHandler(
     std::shared_ptr<HealthCheckServiceImpl::CallHandler> handler) {
-  call_handlers_.erase(std::move(handler));
+  call_handlers_.erase(handler);
 }
 
 //