diff options
| author | JMC47 <JMC4789@gmail.com> | 2025-03-25 18:30:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-25 18:30:15 -0400 |
| commit | 1981f222284448cc8a69d970e1f8569dacec684e (patch) | |
| tree | f30ee8c70fd001f7bb5c76fe80c41ff52532753c /Source/Core/Common/Timer.cpp | |
| parent | eb84b0fb9b3cd21400987a1c10c4a38d4861b9a9 (diff) | |
| parent | c1dea828ab311ac68b85136a97695f447b3b2574 (diff) | |
Merge pull request #13433 from iwubcode/update_min_win10
Update our minimum windows 10 version to 1903 and reinstate code that depends on it
Diffstat (limited to 'Source/Core/Common/Timer.cpp')
| -rw-r--r-- | Source/Core/Common/Timer.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/Core/Common/Timer.cpp b/Source/Core/Common/Timer.cpp index 91381eebd3..fb81164390 100644 --- a/Source/Core/Common/Timer.cpp +++ b/Source/Core/Common/Timer.cpp @@ -7,7 +7,6 @@ #ifdef _WIN32 #include <Windows.h> -#include <ctime> #include <timeapi.h> #else #include <sys/time.h> @@ -68,10 +67,12 @@ u64 Timer::ElapsedMs() const u64 Timer::GetLocalTimeSinceJan1970() { - // TODO Would really, really like to use std::chrono here, but Windows did not support - // std::chrono::current_zone() until 19H1, and other compilers don't even provide support for - // timezone-related parts of chrono. Someday! - // see https://bugs.dolphin-emu.org/issues/13007#note-4 +#ifdef _MSC_VER + std::chrono::zoned_seconds seconds( + std::chrono::current_zone(), + std::chrono::time_point_cast<std::chrono::seconds>(std::chrono::system_clock::now())); + return seconds.get_local_time().time_since_epoch().count(); +#else time_t sysTime, tzDiff, tzDST; time(&sysTime); tm* gmTime = localtime(&sysTime); @@ -87,6 +88,7 @@ u64 Timer::GetLocalTimeSinceJan1970() tzDiff = sysTime - mktime(gmTime); return static_cast<u64>(sysTime + tzDiff + tzDST); +#endif } void Timer::IncreaseResolution() |