zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Avoid boost::posix_time functions that have potential out-of-bounds read bugs. ref #1459" 

This reverts commit a652e4183e.
This commit is contained in:
Daira Hopwood 2016-10-21 03:14:40 +01:00
parent 78293a9989
commit f19cb7b7ee
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/utiltime.cpp
View File

@ -9,7 +9,6 @@
#include "utiltime.h"
#include <chrono>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/thread.hpp>
@ -31,14 +30,14 @@ void SetMockTime(int64_t nMockTimeIn)
int64_t GetTimeMillis()
{
return std::chrono::duration_cast<std::chrono::milliseconds>(
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::microseconds>(
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)