diff options
| author | bunnei <bunneidev@gmail.com> | 2018-08-06 18:03:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-06 18:03:05 -0400 |
| commit | 83ef37ca37e052f4293c7693766f36f24754388e (patch) | |
| tree | c113fb5c96276e1def8d2f4258b66167b0dd0c2b /src/core/core_timing.cpp | |
| parent | bf51bbffcbec41aae4fa6424441aec07ec159880 (diff) | |
| parent | 6c567543222651f6116be8ae1fe72ca3323fb85f (diff) | |
Merge pull request #934 from lioncash/chrono
core_timing: Make GetGlobalTimeUs() return std::chrono::microseconds
Diffstat (limited to 'src/core/core_timing.cpp')
| -rw-r--r-- | src/core/core_timing.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index b2e3a495a..d3bb6f818 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp @@ -226,8 +226,8 @@ void Idle() { downcount = 0; } -u64 GetGlobalTimeUs() { - return GetTicks() * 1000000 / BASE_CLOCK_RATE; +std::chrono::microseconds GetGlobalTimeUs() { + return std::chrono::microseconds{GetTicks() * 1000000 / BASE_CLOCK_RATE}; } int GetDowncount() { |