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

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

This reverts commit f19cb7b7ee.
This commit is contained in:
Jack Grigg 2016-10-21 23:14:00 -05:00
parent f808be7546
commit 09864abc55
No known key found for this signature in database
GPG Key ID: 6A6914DAFBEA00DA
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/utiltime.cpp
View File

@ -9,6 +9,7 @@
#include "utiltime.h"
#include <chrono>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/thread.hpp>
@ -30,14 +31,14 @@ void SetMockTime(int64_t nMockTimeIn)
int64_t GetTimeMillis()
{
return (boost::posix_time::microsec_clock::universal_time() -
boost::posix_time::ptime(boost::gregorian::date(1970,1,1))).total_milliseconds();
return std::chrono::duration_cast<std::chrono::milliseconds>(
std::chrono::system_clock::now().time_since_epoch()).count();
}
int64_t GetTimeMicros()
{
return (boost::posix_time::microsec_clock::universal_time() -
boost::posix_time::ptime(boost::gregorian::date(1970,1,1))).total_microseconds();
return std::chrono::duration_cast<std::chrono::microseconds>(
std::chrono::system_clock::now().time_since_epoch()).count();
}
void MilliSleep(int64_t n)