diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2018-11-20 15:23:27 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-11-20 15:23:27 -0800 |
| commit | b32d8f5d4d99c5f94f970881ef9d8858eb52bbbc (patch) | |
| tree | 1b62b8635d0e0c10f4f5c93425d5a302e33400bf | |
| parent | e4e564679b4fcff665ea27c68b1a491a580203eb (diff) | |
| parent | a9bee9b7edb4045efd52b0e238d07485a791162f (diff) | |
Merge pull request #17219 from yashykt/cleanup
Make Pluck use the changes made in FinalizeResult
| -rw-r--r-- | include/grpcpp/impl/codegen/completion_queue.h | 3 | ||||
| -rw-r--r-- | src/cpp/server/server_cc.cc | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/grpcpp/impl/codegen/completion_queue.h b/include/grpcpp/impl/codegen/completion_queue.h index d603c7c700..fb38788f7d 100644 --- a/include/grpcpp/impl/codegen/completion_queue.h +++ b/include/grpcpp/impl/codegen/completion_queue.h @@ -307,8 +307,7 @@ class CompletionQueue : private GrpcLibraryCodegen { void* ignored = tag; if (tag->FinalizeResult(&ignored, &ok)) { GPR_CODEGEN_ASSERT(ignored == tag); - // Ignore mutations by FinalizeResult: Pluck returns the C API status - return ev.success != 0; + return ok; } } } diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc index 72d005f23d..0a51cf5626 100644 --- a/src/cpp/server/server_cc.cc +++ b/src/cpp/server/server_cc.cc @@ -84,10 +84,7 @@ class ShutdownTag : public internal::CompletionQueueTag { class DummyTag : public internal::CompletionQueueTag { public: - bool FinalizeResult(void** tag, bool* status) { - *status = true; - return true; - } + bool FinalizeResult(void** tag, bool* status) { return true; } }; class UnimplementedAsyncRequestContext { |