Merge pull request #4078 from zhaowenlan1779/port-yuzu-934

Port " core_timing: Make GetGlobalTimeUs() return std::chrono::microseconds" from yuzu
This commit is contained in:
Merry 2018-08-11 10:26:21 +01:00 committed by GitHub
commit c18a7896e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 14 deletions

View file

@ -225,8 +225,8 @@ void Idle() {
downcount = 0;
}
u64 GetGlobalTimeUs() {
return GetTicks() * 1000000 / BASE_CLOCK_RATE_ARM11;
std::chrono::microseconds GetGlobalTimeUs() {
return std::chrono::microseconds{GetTicks() * 1000000 / BASE_CLOCK_RATE_ARM11};
}
s64 GetDowncount() {