mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-05-28 14:56:35 +00:00
Common: use std::chrono for GetLocalTimeSinceJan1970 on Windows
Co-authored-by: Shawn Hoffman <godisgovernment@gmail.com>
This commit is contained in:
parent
452cd1c261
commit
c1dea828ab
1 changed files with 7 additions and 5 deletions
|
@ -7,7 +7,6 @@
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include <Windows.h>
|
#include <Windows.h>
|
||||||
#include <ctime>
|
|
||||||
#include <timeapi.h>
|
#include <timeapi.h>
|
||||||
#else
|
#else
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
|
@ -68,10 +67,12 @@ u64 Timer::ElapsedMs() const
|
||||||
|
|
||||||
u64 Timer::GetLocalTimeSinceJan1970()
|
u64 Timer::GetLocalTimeSinceJan1970()
|
||||||
{
|
{
|
||||||
// TODO Would really, really like to use std::chrono here, but Windows did not support
|
#ifdef _MSC_VER
|
||||||
// std::chrono::current_zone() until 19H1, and other compilers don't even provide support for
|
std::chrono::zoned_seconds seconds(
|
||||||
// timezone-related parts of chrono. Someday!
|
std::chrono::current_zone(),
|
||||||
// see https://bugs.dolphin-emu.org/issues/13007#note-4
|
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_t sysTime, tzDiff, tzDST;
|
||||||
time(&sysTime);
|
time(&sysTime);
|
||||||
tm* gmTime = localtime(&sysTime);
|
tm* gmTime = localtime(&sysTime);
|
||||||
|
@ -87,6 +88,7 @@ u64 Timer::GetLocalTimeSinceJan1970()
|
||||||
tzDiff = sysTime - mktime(gmTime);
|
tzDiff = sysTime - mktime(gmTime);
|
||||||
|
|
||||||
return static_cast<u64>(sysTime + tzDiff + tzDST);
|
return static_cast<u64>(sysTime + tzDiff + tzDST);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void Timer::IncreaseResolution()
|
void Timer::IncreaseResolution()
|
||||||
|
|
Loading…
Add table
Reference in a new issue