From 575a3f61a9d74f362da07202158f3ff63a063467 Mon Sep 17 00:00:00 2001 From: Mordred Date: Thu, 1 Feb 2018 00:16:47 +0100 Subject: [PATCH] Changed timestamp(seconds) getter to use std::time internally, should get rid of the DC problem --- src/common/Util/Util.cpp | 9 +++++---- src/common/Util/Util.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/common/Util/Util.cpp b/src/common/Util/Util.cpp index b92d61a9..48c565ae 100644 --- a/src/common/Util/Util.cpp +++ b/src/common/Util/Util.cpp @@ -62,7 +62,7 @@ std::string Core::Util::binaryToHexDump( uint8_t* pBinData, uint16_t size ) uint8_t by = pBinData[i + j]; line[hexColumn] = hexChars[( by >> 4 ) & 0xF]; line[hexColumn + 1] = hexChars[by & 0xF]; - line[charColumn] = by < 32 ? '.' : static_cast( by ); + line[charColumn] = by < 32 ? '.' : static_cast< char >( by ); } hexColumn += 3; @@ -78,13 +78,14 @@ std::string Core::Util::binaryToHexDump( uint8_t* pBinData, uint16_t size ) uint64_t Core::Util::getTimeMs() { - std::chrono::milliseconds epoch = std::chrono::duration_cast< std::chrono::milliseconds >(std::chrono::system_clock::now().time_since_epoch()); + std::chrono::milliseconds epoch = std::chrono::duration_cast< std::chrono::milliseconds > + ( std::chrono::system_clock::now().time_since_epoch() ); return epoch.count(); } -uint64_t Core::Util::getTimeSeconds() +int64_t Core::Util::getTimeSeconds() { - std::chrono::seconds epoch = std::chrono::duration_cast< std::chrono::seconds >(std::chrono::system_clock::now().time_since_epoch()); + std::chrono::seconds epoch = std::chrono::seconds( std::time( nullptr ) ); return epoch.count(); } diff --git a/src/common/Util/Util.h b/src/common/Util/Util.h index 2c38f55f..b03dd987 100644 --- a/src/common/Util/Util.h +++ b/src/common/Util/Util.h @@ -13,7 +13,7 @@ std::string binaryToHexDump( uint8_t* pBinData, uint16_t size ); uint64_t getTimeMs(); -uint64_t getTimeSeconds(); +int64_t getTimeSeconds(); uint64_t getEorzeanTimeStamp();