summaryrefslogtreecommitdiffstats
path: root/src/core/core_timing.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-08-06 04:07:28 +0200
committerLioncash <mathew1800@gmail.com>2018-08-06 04:07:30 +0200
commita0c3a46aa9d2186e833bdc1872f9eb877230b429 (patch)
treea8715386f729ac3b10f0862de5e8b08537495673 /src/core/core_timing.cpp
parentMerge pull request #927 from bunnei/fix-texs (diff)
downloadyuzu-a0c3a46aa9d2186e833bdc1872f9eb877230b429.tar
yuzu-a0c3a46aa9d2186e833bdc1872f9eb877230b429.tar.gz
yuzu-a0c3a46aa9d2186e833bdc1872f9eb877230b429.tar.bz2
yuzu-a0c3a46aa9d2186e833bdc1872f9eb877230b429.tar.lz
yuzu-a0c3a46aa9d2186e833bdc1872f9eb877230b429.tar.xz
yuzu-a0c3a46aa9d2186e833bdc1872f9eb877230b429.tar.zst
yuzu-a0c3a46aa9d2186e833bdc1872f9eb877230b429.zip
Diffstat (limited to 'src/core/core_timing.cpp')
-rw-r--r--src/core/core_timing.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index a1b6f96f1..9c934478b 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() {