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.h | |
| 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.h')
| -rw-r--r-- | src/core/core_timing.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/core_timing.h b/src/core/core_timing.h index 5bbde47f4..dfa161c0d 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h @@ -17,6 +17,7 @@ * ScheduleEvent(periodInCycles - cyclesLate, callback, "whatever") */ +#include <chrono> #include <functional> #include <string> #include "common/common_types.h" @@ -86,7 +87,7 @@ void ClearPendingEvents(); void ForceExceptionCheck(s64 cycles); -u64 GetGlobalTimeUs(); +std::chrono::microseconds GetGlobalTimeUs(); int GetDowncount(); |