From 59588c616223c64834326b206865664403a647fe Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Thu, 3 Sep 2015 02:29:30 +0200 Subject: [PATCH] Removing pessimizing moves. Pass #2. --- test/cpp/end2end/thread_stress_test.cc | 2 +- test/cpp/qps/driver.cc | 12 ++++++------ test/cpp/qps/qps_worker.cc | 2 +- test/cpp/qps/server_async.cc | 2 +- test/cpp/util/cli_call_test.cc | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/cpp/end2end/thread_stress_test.cc b/test/cpp/end2end/thread_stress_test.cc index 539e141d396..75a07d89c5d 100644 --- a/test/cpp/end2end/thread_stress_test.cc +++ b/test/cpp/end2end/thread_stress_test.cc @@ -191,7 +191,7 @@ class End2endTest : public ::testing::Test { void ResetStub() { std::shared_ptr channel = CreateChannel(server_address_.str(), InsecureCredentials()); - stub_ = std::move(grpc::cpp::test::util::TestService::NewStub(channel)); + stub_ = grpc::cpp::test::util::TestService::NewStub(channel); } std::unique_ptr stub_; diff --git a/test/cpp/qps/driver.cc b/test/cpp/qps/driver.cc index a63548b32d7..6e71c459353 100644 --- a/test/cpp/qps/driver.cc +++ b/test/cpp/qps/driver.cc @@ -153,14 +153,14 @@ std::unique_ptr RunScenario( // where class contained in std::vector must have a copy constructor auto* servers = new ServerData[num_servers]; for (size_t i = 0; i < num_servers; i++) { - servers[i].stub = std::move( - Worker::NewStub(CreateChannel(workers[i], InsecureCredentials()))); + servers[i].stub = Worker::NewStub(CreateChannel(workers[i], + InsecureCredentials())); ServerArgs args; result_server_config = server_config; result_server_config.set_host(workers[i]); *args.mutable_setup() = server_config; servers[i].stream = - std::move(servers[i].stub->RunServer(runsc::AllocContext(&contexts))); + servers[i].stub->RunServer(runsc::AllocContext(&contexts)); GPR_ASSERT(servers[i].stream->Write(args)); ServerStatus init_status; GPR_ASSERT(servers[i].stream->Read(&init_status)); @@ -181,14 +181,14 @@ std::unique_ptr RunScenario( // where class contained in std::vector must have a copy constructor auto* clients = new ClientData[num_clients]; for (size_t i = 0; i < num_clients; i++) { - clients[i].stub = std::move(Worker::NewStub( - CreateChannel(workers[i + num_servers], InsecureCredentials()))); + clients[i].stub = Worker::NewStub(CreateChannel(workers[i + num_servers], + InsecureCredentials())); ClientArgs args; result_client_config = client_config; result_client_config.set_host(workers[i + num_servers]); *args.mutable_setup() = client_config; clients[i].stream = - std::move(clients[i].stub->RunTest(runsc::AllocContext(&contexts))); + clients[i].stub->RunTest(runsc::AllocContext(&contexts)); GPR_ASSERT(clients[i].stream->Write(args)); ClientStatus init_status; GPR_ASSERT(clients[i].stream->Read(&init_status)); diff --git a/test/cpp/qps/qps_worker.cc b/test/cpp/qps/qps_worker.cc index 4b4ca1a0ce6..d19499be439 100644 --- a/test/cpp/qps/qps_worker.cc +++ b/test/cpp/qps/qps_worker.cc @@ -229,7 +229,7 @@ QpsWorker::QpsWorker(int driver_port, int server_port) { gpr_free(server_address); - server_ = std::move(builder.BuildAndStart()); + server_ = builder.BuildAndStart(); } QpsWorker::~QpsWorker() {} diff --git a/test/cpp/qps/server_async.cc b/test/cpp/qps/server_async.cc index c25d5afc6d1..0ed2048d4a7 100644 --- a/test/cpp/qps/server_async.cc +++ b/test/cpp/qps/server_async.cc @@ -68,7 +68,7 @@ class AsyncQpsServerTest : public Server { builder.RegisterAsyncService(&async_service_); for (int i = 0; i < config.threads(); i++) { - srv_cqs_.emplace_back(std::move(builder.AddCompletionQueue())); + srv_cqs_.emplace_back(builder.AddCompletionQueue()); } server_ = builder.BuildAndStart(); diff --git a/test/cpp/util/cli_call_test.cc b/test/cpp/util/cli_call_test.cc index b4133aa71ac..9c8d59987e0 100644 --- a/test/cpp/util/cli_call_test.cc +++ b/test/cpp/util/cli_call_test.cc @@ -90,7 +90,7 @@ class CliCallTest : public ::testing::Test { void ResetStub() { channel_ = CreateChannel(server_address_.str(), InsecureCredentials()); - stub_ = std::move(grpc::cpp::test::util::TestService::NewStub(channel_)); + stub_ = grpc::cpp::test::util::TestService::NewStub(channel_); } std::shared_ptr channel_;