diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-05-01 13:21:57 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-05-01 13:21:57 -0700 |
| commit | d6c16558b40b723d61039c2bfbf491f90adf3ecb (patch) | |
| tree | b30695b00ac0a6c7554d98f2b974e8f7bb8fbbc5 /src/cpp/common/completion_queue.cc | |
| parent | 9805bb2ce86413105e706da41a1b3e6040264e34 (diff) | |
| parent | 5ae895a5d06fad59a89ce6e8923b1145dea663bd (diff) | |
Merge github.com:grpc/grpc into one-read
Conflicts:
src/core/iomgr/tcp_posix.c
src/core/profiling/basic_timers.c
Diffstat (limited to 'src/cpp/common/completion_queue.cc')
| -rw-r--r-- | src/cpp/common/completion_queue.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpp/common/completion_queue.cc b/src/cpp/common/completion_queue.cc index 07122db4a5..2b9000ea08 100644 --- a/src/cpp/common/completion_queue.cc +++ b/src/cpp/common/completion_queue.cc @@ -92,7 +92,7 @@ bool CompletionQueue::Pluck(CompletionQueueTag* tag) { void CompletionQueue::TryPluck(CompletionQueueTag* tag) { std::unique_ptr<grpc_event, EventDeleter> ev; - ev.reset(grpc_completion_queue_pluck(cq_, tag, gpr_inf_past)); + ev.reset(grpc_completion_queue_pluck(cq_, tag, gpr_time_0)); if (!ev) return; bool ok = ev->data.op_complete == GRPC_OP_OK; void* ignored = tag; |