diff options
author | 2015-03-24 18:01:37 -0700 | |
---|---|---|
committer | 2015-03-24 18:01:37 -0700 | |
commit | 4cba0ca39c9f979b231d1e64c3ef3aa3104bf1ca (patch) | |
tree | 53d3938f3e05d0fc21050eb37d88005cf8d12a96 /src/cpp | |
parent | 1856db41afee60484d9d2a23788a956344b683e2 (diff) |
Allow nullptr to be passed in if user doesn't care about tag
for next,asyncnext
Diffstat (limited to 'src/cpp')
-rw-r--r-- | src/cpp/common/completion_queue.cc | 6 |
1 files changed, 5 insertions, 1 deletions
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) { |