Skip to content

Commit

Permalink
[fuchsia] Update zx_clock_get callers (flutter#8998)
Browse files Browse the repository at this point in the history
Fuchsia is changing zx_clock_get to return a zx_status_t. This change
prepares us for that change.
  • Loading branch information
abarth authored May 17, 2019
1 parent 03f35e2 commit 197feb5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion fml/time/time_point.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace fml {

// static
TimePoint TimePoint::Now() {
return TimePoint(zx_clock_get(ZX_CLOCK_MONOTONIC));
return TimePoint(zx_clock_get_monotonic());
}

#else
Expand Down
4 changes: 3 additions & 1 deletion shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/system.cc
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,9 @@ Dart_Handle System::VmoMap(fml::RefPtr<Handle> vmo) {
}

uint64_t System::ClockGet(uint32_t clock_id) {
return zx_clock_get(clock_id);
zx_time_t result = 0;
zx_clock_get_new(clock_id, &result);
return result;
}

// clang-format: off
Expand Down

0 comments on commit 197feb5

Please sign in to comment.