From f19cb7b7eeda8ae0a31340795ef7cfbf09557d47 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Fri, 21 Oct 2016 03:14:40 +0100 Subject: [PATCH] Revert "Avoid boost::posix_time functions that have potential out-of-bounds read bugs. ref #1459" This reverts commit a652e4183ec8e0a8041a7f29c85e36557acac327. --- src/utiltime.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/utiltime.cpp b/src/utiltime.cpp index a7cdeb114..d31628899 100644 --- a/src/utiltime.cpp +++ b/src/utiltime.cpp @@ -9,7 +9,6 @@ #include "utiltime.h" -#include #include #include @@ -31,14 +30,14 @@ void SetMockTime(int64_t nMockTimeIn) int64_t GetTimeMillis() { - return std::chrono::duration_cast( - std::chrono::system_clock::now().time_since_epoch()).count(); + return (boost::posix_time::microsec_clock::universal_time() - + boost::posix_time::ptime(boost::gregorian::date(1970,1,1))).total_milliseconds(); } int64_t GetTimeMicros() { - return std::chrono::duration_cast( - std::chrono::system_clock::now().time_since_epoch()).count(); + return (boost::posix_time::microsec_clock::universal_time() - + boost::posix_time::ptime(boost::gregorian::date(1970,1,1))).total_microseconds(); } void MilliSleep(int64_t n)