Skip to content
Permalink
Browse files
Merge pull request #10963 from shuffle2/notime
back out using std::chrono for timezone stuff
  • Loading branch information
JosJuice committed Aug 7, 2022
2 parents 7b2b559 + 6e94c20 commit d69f38f
Showing 1 changed file with 5 additions and 7 deletions.
@@ -7,6 +7,7 @@

#ifdef _WIN32
#include <Windows.h>
#include <ctime>
#include <timeapi.h>
#else
#include <sys/time.h>
@@ -67,12 +68,10 @@ u64 Timer::ElapsedMs() const

u64 Timer::GetLocalTimeSinceJan1970()
{
#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
// 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
time_t sysTime, tzDiff, tzDST;
time(&sysTime);
tm* gmTime = localtime(&sysTime);
@@ -88,7 +87,6 @@ u64 Timer::GetLocalTimeSinceJan1970()
tzDiff = sysTime - mktime(gmTime);

return static_cast<u64>(sysTime + tzDiff + tzDST);
#endif
}

void Timer::IncreaseResolution()

0 comments on commit d69f38f

Please sign in to comment.