diff options
| author |  Yuchen Zeng <zyc@google.com> | 2017-02-27 13:35:41 -0800 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2017-03-17 15:57:23 -0700 |
| commit | 2c977084c8fec4bc395976338683d1d480bab91e (patch) | |
| tree | cf696a8403371b308a45d02445864159ba527e08 /src/core/lib/iomgr/timer_generic.h | |
| parent | dc6b569d97aa54e987681f869f13acdd9c89834f (diff) | |
| parent | dc720ca6bf27181c040cefcdb298d9dee8bf3058 (diff) | |
Merge remote-tracking branch 'upstream/master' into cares_bazel_rule
Diffstat (limited to 'src/core/lib/iomgr/timer_generic.h')
| -rw-r--r-- | src/core/lib/iomgr/timer_generic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/timer_generic.h b/src/core/lib/iomgr/timer_generic.h index 9d901c7e68..1608dce9fb 100644 --- a/src/core/lib/iomgr/timer_generic.h +++ b/src/core/lib/iomgr/timer_generic.h @@ -40,7 +40,7 @@ struct grpc_timer { gpr_timespec deadline; uint32_t heap_index; /* INVALID_HEAP_INDEX if not in heap */ - int triggered; + bool pending; struct grpc_timer *next; struct grpc_timer *prev; grpc_closure *closure; |