diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-07-26 12:37:53 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-07-26 12:37:53 -0700 |
| commit | dfc42da76011eec3270b3dbcc94748916e0aa5b2 (patch) | |
| tree | 5e1a69afefaaee7457ed1fa5796d00c06957757e /src/cpp/util/time.cc | |
| parent | b256faa353159c0b6f3477777bed75b4f9de3e16 (diff) | |
| parent | 5c575dd6e4b01cd68cca5d1917b58023dcf4ca0f (diff) | |
Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other
Conflicts:
src/core/iomgr/tcp_server_windows.c
Diffstat (limited to 'src/cpp/util/time.cc')
| -rw-r--r-- | src/cpp/util/time.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cpp/util/time.cc b/src/cpp/util/time.cc index a814cad452..799c597e0b 100644 --- a/src/cpp/util/time.cc +++ b/src/cpp/util/time.cc @@ -79,9 +79,10 @@ void TimepointHR2Timespec(const high_resolution_clock::time_point& from, } system_clock::time_point Timespec2Timepoint(gpr_timespec t) { - if (gpr_time_cmp(t, gpr_inf_future(GPR_CLOCK_REALTIME)) == 0) { + if (gpr_time_cmp(t, gpr_inf_future(t.clock_type)) == 0) { return system_clock::time_point::max(); } + t = gpr_convert_clock_type(t, GPR_CLOCK_REALTIME); system_clock::time_point tp; tp += duration_cast<system_clock::time_point::duration>(seconds(t.tv_sec)); tp += |