diff options
author | 2017-11-13 15:41:31 -0800 | |
---|---|---|
committer | 2017-11-13 15:41:31 -0800 | |
commit | b0bad8f3864dc9c8745736fe68efe513b2b84932 (patch) | |
tree | a94f7bf6f6e1d5dc257bec928359bad16623eada /test/core/end2end/cq_verifier_native.cc | |
parent | e52772451a7bbf4f3f7b72cfc369781fd74a6930 (diff) | |
parent | a61abff6adfd035560d20bc255c01c6c83d22091 (diff) |
Merge pull request #13349 from ctiller/lfe3
Convert all uses of NULL to nullptr
Diffstat (limited to 'test/core/end2end/cq_verifier_native.cc')
-rw-r--r-- | test/core/end2end/cq_verifier_native.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/core/end2end/cq_verifier_native.cc b/test/core/end2end/cq_verifier_native.cc index a0a7c832e5..e93956b188 100644 --- a/test/core/end2end/cq_verifier_native.cc +++ b/test/core/end2end/cq_verifier_native.cc @@ -19,6 +19,8 @@ /* This check is for testing only. */ #ifndef GRPC_UV +#include <grpc/support/alloc.h> + #include "test/core/end2end/cq_verifier_internal.h" /* the verifier itself */ @@ -27,13 +29,12 @@ struct cq_verifier { grpc_completion_queue* cq; /* start of expectation list */ expectation* first_expectation; - uv_timer_t timer; }; cq_verifier* cq_verifier_create(grpc_completion_queue* cq) { cq_verifier* v = static_cast<cq_verifier*>(gpr_malloc(sizeof(cq_verifier))); v->cq = cq; - cq_verifier_set_first_expectation(v, NULL); + cq_verifier_set_first_expectation(v, nullptr); return v; } @@ -53,7 +54,7 @@ void cq_verifier_set_first_expectation(cq_verifier* v, expectation* e) { grpc_event cq_verifier_next_event(cq_verifier* v, int timeout_seconds) { const gpr_timespec deadline = grpc_timeout_seconds_to_deadline(timeout_seconds); - return grpc_completion_queue_next(v->cq, deadline, NULL); + return grpc_completion_queue_next(v->cq, deadline, nullptr); } #endif /* GRPC_UV */ |