From df9f764bf873e1484b6ca60e4ca0207d3117cd06 Mon Sep 17 00:00:00 2001
From: vjpai <vpai@google.com>
Date: Tue, 24 Mar 2015 22:54:39 -0700
Subject: [PATCH] Revert "Allow nullptr to be passed in if user doesn't care
about tag"
This reverts commit 4cba0ca39c9f979b231d1e64c3ef3aa3104bf1ca.
---
src/cpp/common/completion_queue.cc | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/cpp/common/completion_queue.cc b/src/cpp/common/completion_queue.cc
index 7cea0185ec..cea2d24831 100644
--- a/src/cpp/common/completion_queue.cc
+++ b/src/cpp/common/completion_queue.cc
@@ -59,14 +59,10 @@ 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