From 4cba0ca39c9f979b231d1e64c3ef3aa3104bf1ca Mon Sep 17 00:00:00 2001
From: vjpai <vpai@google.com>
Date: Tue, 24 Mar 2015 18:01:37 -0700
Subject: [PATCH] Allow nullptr to be passed in if user doesn't care about tag
for next,asyncnext
---
src/cpp/common/completion_queue.cc | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/cpp/common/completion_queue.cc b/src/cpp/common/completion_queue.cc
index cea2d24831..7cea0185ec 100644
--- a/src/cpp/common/completion_queue.cc
+++ b/src/cpp/common/completion_queue.cc
@@ -59,10 +59,14 @@ class EventDeleter {
CompletionQueue::NextStatus CompletionQueue::AsyncNextInternal(
void** tag, bool* ok, gpr_timespec deadline) {
std::unique_ptr<grpc_event, EventDeleter> ev;
+ void *dummy;
+
+ if (tag == nullptr) // If user doesn't care
+ tag = &dummy; // Need to pass down something
for (;;) {
ev.reset(grpc_completion_queue_next(cq_, deadline));
- if (!ev) { /* got a NULL back because deadline passed */
+ if (!ev) { // got a NULL back because deadline passed
return TIMEOUT;
}
if (ev->type == GRPC_QUEUE_SHUTDOWN) {
--
GitLab