diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-02-18 15:54:14 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-02-18 15:54:14 -0800 |
| commit | 2627e4e0a917cc438bff186d0bea2bee030ac98a (patch) | |
| tree | ff90c505d0708e8acc408bf22420b92cfce04860 | |
| parent | 2d11c93ab548e359414efdbc5fcd013e8c5779ff (diff) | |
Merge with async unary changes
| -rw-r--r-- | include/grpc++/async_unary_call.h | 4 | ||||
| -rw-r--r-- | src/compiler/cpp_generator.cc | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/grpc++/async_unary_call.h b/include/grpc++/async_unary_call.h index 105250ce9d..b4a654c4a9 100644 --- a/include/grpc++/async_unary_call.h +++ b/include/grpc++/async_unary_call.h @@ -111,8 +111,6 @@ class ServerAsyncResponseWriter final : public ServerAsyncStreamingInterface { if (status.IsOk()) { finish_buf_.AddSendMessage(msg); } - bool cancelled = false; - finish_buf_.AddServerRecvClose(&cancelled); finish_buf_.AddServerSendStatus(&ctx_->trailing_metadata_, status); call_.PerformOps(&finish_buf_); } @@ -124,8 +122,6 @@ class ServerAsyncResponseWriter final : public ServerAsyncStreamingInterface { finish_buf_.AddSendInitialMetadata(&ctx_->initial_metadata_); ctx_->sent_initial_metadata_ = true; } - bool cancelled = false; - finish_buf_.AddServerRecvClose(&cancelled); finish_buf_.AddServerSendStatus(&ctx_->trailing_metadata_, status); call_.PerformOps(&finish_buf_); } diff --git a/src/compiler/cpp_generator.cc b/src/compiler/cpp_generator.cc index b73b000a1c..f10824e6b0 100644 --- a/src/compiler/cpp_generator.cc +++ b/src/compiler/cpp_generator.cc @@ -386,7 +386,7 @@ void PrintSourceClientMethod(google::protobuf::io::Printer *printer, "const $Request$& request, " "::grpc::CompletionQueue* cq, void* tag) {\n"); printer->Print(*vars, - " return new ClientAsyncResponseReader< $Response$>(" + " return new ::grpc::ClientAsyncResponseReader< $Response$>(" "channel(), cq, " "::grpc::RpcMethod($Service$_method_names[$Idx$]), " "context, request, tag);\n" |