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 | 51c6d096803545fe6e5f46c63f13d895594e9651 (patch) | |
| tree | c113fb5c96276e1def8d2f4258b66167b0dd0c2b /src/core/core_timing.cpp | |
| parent | 88fe478561fd9d84ff1386a936b0d8649a317a76 (diff) | |
| parent | 610c7e76853ce99a7e40beb89a04c84a39d9d744 (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 b2e3a495a7..d3bb6f8188 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() { |