diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-05-18 23:04:11 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-05-18 23:04:11 -0700 |
| commit | 147a9f2ead25916a84c1145d1b250992e76463be (patch) | |
| tree | 3a3149a38625e090d70c626186d7803f9bce064a /src/core/lib/surface/alarm.c | |
| parent | 9766f4f42482155c5442bd5e3c065ec68caa7a1f (diff) | |
| parent | ef96264d8724a71f4f1fef5ebaf361d28b1a1752 (diff) | |
Merge branch 'reuse_port' into reuse_affinity
Diffstat (limited to 'src/core/lib/surface/alarm.c')
| -rw-r--r-- | src/core/lib/surface/alarm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/lib/surface/alarm.c b/src/core/lib/surface/alarm.c index 2cf2f00b31..aa9d60ee6a 100644 --- a/src/core/lib/surface/alarm.c +++ b/src/core/lib/surface/alarm.c @@ -48,9 +48,9 @@ struct grpc_alarm { static void do_nothing_end_completion(grpc_exec_ctx *exec_ctx, void *arg, grpc_cq_completion *c) {} -static void alarm_cb(grpc_exec_ctx *exec_ctx, void *arg, bool success) { +static void alarm_cb(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) { grpc_alarm *alarm = arg; - grpc_cq_end_op(exec_ctx, alarm->cq, alarm->tag, success, + grpc_cq_end_op(exec_ctx, alarm->cq, alarm->tag, error, do_nothing_end_completion, NULL, &alarm->completion); } |