diff options
| author |  Noah Eisen <ncteisen@google.com> | 2017-11-13 16:44:02 -0800 |
|---|---|---|
| committer | Noah Eisen <ncteisen@google.com> | 2017-11-13 16:44:02 -0800 |
| commit | 68bb1bf7480e87005220003985da19ea0a0929d0 (patch) | |
| tree | c434576b07f94f427925dd7f7dfba4dbdeecee31 /src/core/lib/iomgr/call_combiner.cc | |
| parent | 6bf73e8cf6d9d2ede844ab628a0b88000ffc9afa (diff) | |
| parent | b0bad8f3864dc9c8745736fe68efe513b2b84932 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into tracing++
Diffstat (limited to 'src/core/lib/iomgr/call_combiner.cc')
| -rw-r--r-- | src/core/lib/iomgr/call_combiner.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/call_combiner.cc b/src/core/lib/iomgr/call_combiner.cc index 752303e260..b5910b42e4 100644 --- a/src/core/lib/iomgr/call_combiner.cc +++ b/src/core/lib/iomgr/call_combiner.cc @@ -119,7 +119,7 @@ void grpc_call_combiner_stop(grpc_exec_ctx* exec_ctx, bool empty; grpc_closure* closure = (grpc_closure*)gpr_mpscq_pop_and_check_end( &call_combiner->queue, &empty); - if (closure == NULL) { + if (closure == nullptr) { // This can happen either due to a race condition within the mpscq // code or because of a race with grpc_call_combiner_start(). if (grpc_call_combiner_trace.enabled()) { |