diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2018-05-31 19:47:30 -0700 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2018-05-31 19:47:30 -0700 |
| commit | 905f0ca39e5a64d91c4c5d7a09bc0768dabfc454 (patch) | |
| tree | d682c826d4b74915c49d09f9917ff58609ce21a8 /test/core/iomgr | |
| parent | adc733f0249eaaabfed5ae9949af1ac416969cef (diff) | |
| parent | a421c1539db7fa94a4b1ea1b8b9a0288439ef1b8 (diff) | |
merge master
Diffstat (limited to 'test/core/iomgr')
| -rw-r--r-- | test/core/iomgr/resolve_address_posix_test.cc | 2 | ||||
| -rw-r--r-- | test/core/iomgr/resolve_address_test.cc | 2 | ||||
| -rw-r--r-- | test/core/iomgr/timer_heap_test.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index 79b2b50e70..e495e4c877 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -91,7 +91,7 @@ static void actually_poll(void* argsp) { break; } grpc_millis time_left = deadline - grpc_core::ExecCtx::Get()->Now(); - gpr_log(GPR_DEBUG, "done=%d, time_left=%" PRIdPTR, done, time_left); + gpr_log(GPR_DEBUG, "done=%d, time_left=%" PRId64, done, time_left); GPR_ASSERT(time_left >= 0); grpc_pollset_worker* worker = nullptr; gpr_mu_lock(args->mu); diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc index a0dc484f3e..2fb831a6a4 100644 --- a/test/core/iomgr/resolve_address_test.cc +++ b/test/core/iomgr/resolve_address_test.cc @@ -82,7 +82,7 @@ static void poll_pollset_until_request_done(args_struct* args) { break; } grpc_millis time_left = deadline - grpc_core::ExecCtx::Get()->Now(); - gpr_log(GPR_DEBUG, "done=%d, time_left=%" PRIdPTR, done, time_left); + gpr_log(GPR_DEBUG, "done=%d, time_left=%" PRId64, done, time_left); GPR_ASSERT(time_left >= 0); grpc_pollset_worker* worker = nullptr; gpr_mu_lock(args->mu); diff --git a/test/core/iomgr/timer_heap_test.cc b/test/core/iomgr/timer_heap_test.cc index ebe5e32f3a..ebe5e6610d 100644 --- a/test/core/iomgr/timer_heap_test.cc +++ b/test/core/iomgr/timer_heap_test.cc @@ -204,7 +204,7 @@ static void test2(void) { } if (num_inserted) { - gpr_atm* min_deadline = nullptr; + grpc_millis* min_deadline = nullptr; for (size_t i = 0; i < elems_size; i++) { if (elems[i].inserted) { if (min_deadline == nullptr) { |