diff --git a/examples/cpp/route_guide/route_guide_callback_client.cc b/examples/cpp/route_guide/route_guide_callback_client.cc index 4bab4ae30d7..102061269a8 100644 --- a/examples/cpp/route_guide/route_guide_callback_client.cc +++ b/examples/cpp/route_guide/route_guide_callback_client.cc @@ -138,7 +138,7 @@ class RouteGuideClient { bool done_ = false; }; Reader reader(stub_.get(), kCoordFactor_, rect); - Status status = std::move(reader.Await()); + Status status = reader.Await(); if (status.ok()) { std::cout << "ListFeatures rpc succeeded." << std::endl; } else { @@ -217,7 +217,7 @@ class RouteGuideClient { }; Recorder recorder(stub_.get(), kCoordFactor_, &feature_list_); RouteSummary stats; - Status status = std::move(recorder.Await(&stats)); + Status status = recorder.Await(&stats); if (status.ok()) { std::cout << "Finished trip with " << stats.point_count() << " points\n" << "Passed " << stats.feature_count() << " features\n" @@ -288,7 +288,7 @@ class RouteGuideClient { }; Chatter chatter(stub_.get()); - Status status = std::move(chatter.Await()); + Status status = chatter.Await(); if (!status.ok()) { std::cout << "RouteChat rpc failed." << std::endl; } diff --git a/test/cpp/end2end/channelz_service_test.cc b/test/cpp/end2end/channelz_service_test.cc index cf09d2f3101..d8afee1a659 100644 --- a/test/cpp/end2end/channelz_service_test.cc +++ b/test/cpp/end2end/channelz_service_test.cc @@ -139,12 +139,6 @@ std::string ReadFile(const char* file_path) { return file_contents; } -grpc_core::PemKeyCertPairList ReadTlsIdentityPair(const char* key_path, - const char* cert_path) { - return grpc_core::PemKeyCertPairList{ - grpc_core::PemKeyCertPair(ReadFile(key_path), ReadFile(cert_path))}; -} - std::shared_ptr GetChannelCredentials( CredentialsType type, ChannelArguments* args) { if (type == CredentialsType::kInsecure) {