diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2017-11-16 19:31:28 -0800 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2017-11-16 19:31:28 -0800 |
| commit | 177039b2f89e73ad0d048da021f939f3a153c4e2 (patch) | |
| tree | c7f10f04cd9a0872863e2b181162bc9928160cd8 /src/core/lib/iomgr/iomgr.cc | |
| parent | 995aa91bbbc68deb6dfd7c667cfee3af2bedec08 (diff) | |
| parent | 82c8f945302f128495e261b853ac49f1dfbe69a1 (diff) | |
Merge master
Diffstat (limited to 'src/core/lib/iomgr/iomgr.cc')
| -rw-r--r-- | src/core/lib/iomgr/iomgr.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc index 9c74b5d1c3..f3f080e315 100644 --- a/src/core/lib/iomgr/iomgr.cc +++ b/src/core/lib/iomgr/iomgr.cc @@ -99,7 +99,7 @@ void grpc_iomgr_shutdown() { last_warning_time = gpr_now(GPR_CLOCK_REALTIME); } grpc_core::ExecCtx::Get()->SetNowIomgrShutdown(); - if (grpc_timer_check(NULL) == GRPC_TIMERS_FIRED) { + if (grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED) { gpr_mu_unlock(&g_mu); grpc_core::ExecCtx::Get()->Flush(); grpc_iomgr_platform_flush(); |