From bef9cbc7dc315450fe15d4b80b6ba34a0822ff2e Mon Sep 17 00:00:00 2001 From: Vijay Pai Date: Thu, 26 Mar 2015 11:02:06 -0700 Subject: [PATCH] Eliminate range-based fors --- test/cpp/qps/client_async.cc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/test/cpp/qps/client_async.cc b/test/cpp/qps/client_async.cc index e4e7e73762d..590d56d8d00 100644 --- a/test/cpp/qps/client_async.cc +++ b/test/cpp/qps/client_async.cc @@ -281,16 +281,17 @@ class AsyncStreamingClient GRPC_FINAL : public Client { int t = 0; for (int i = 0; i < config.outstanding_rpcs_per_channel(); i++) { - for (auto &channel : channels_) { - auto *cq = cli_cqs_[t].get(); + for (auto channel = channels_.begin(); channel != channels_.end(); + channel++) { + auto* cq = cli_cqs_[t].get(); t = (t + 1) % cli_cqs_.size(); auto start_req = [cq](TestService::Stub *stub, grpc::ClientContext *ctx, void *tag) { auto stream = stub->AsyncStreamingCall(ctx, cq, tag); - return stream; + return stream; }; - TestService::Stub *stub = channel.get_stub(); + TestService::Stub *stub = channel->get_stub(); const SimpleRequest &request = request_; new ClientRpcContextStreamingImpl( stub, request, start_req, check_done); @@ -303,11 +304,11 @@ class AsyncStreamingClient GRPC_FINAL : public Client { ~AsyncStreamingClient() GRPC_OVERRIDE { EndThreads(); - for (auto &cq : cli_cqs_) { - cq->Shutdown(); + for (auto cq = cli_cqs_.begin(); cq != cli_cqs_.end(); cq++) { + (*cq)->Shutdown(); void *got_tag; bool ok; - while (cq->Next(&got_tag, &ok)) { + while ((*cq)->Next(&got_tag, &ok)) { delete ClientRpcContext::detag(got_tag); } }