Auto merge of #1571 - daira:1459.avoid-boost-posix-time, r=daira
Avoid boost::posix_time functions that have potential out-of-bounds read bugs ref #1459 Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
commit
bb891cb4a2
|
@ -9,6 +9,7 @@
|
||||||
|
|
||||||
#include "utiltime.h"
|
#include "utiltime.h"
|
||||||
|
|
||||||
|
#include <chrono>
|
||||||
#include <boost/date_time/posix_time/posix_time.hpp>
|
#include <boost/date_time/posix_time/posix_time.hpp>
|
||||||
#include <boost/thread.hpp>
|
#include <boost/thread.hpp>
|
||||||
|
|
||||||
|
@ -30,14 +31,14 @@ void SetMockTime(int64_t nMockTimeIn)
|
||||||
|
|
||||||
int64_t GetTimeMillis()
|
int64_t GetTimeMillis()
|
||||||
{
|
{
|
||||||
return (boost::posix_time::microsec_clock::universal_time() -
|
return std::chrono::duration_cast<std::chrono::milliseconds>(
|
||||||
boost::posix_time::ptime(boost::gregorian::date(1970,1,1))).total_milliseconds();
|
std::chrono::system_clock::now().time_since_epoch()).count();
|
||||||
}
|
}
|
||||||
|
|
||||||
int64_t GetTimeMicros()
|
int64_t GetTimeMicros()
|
||||||
{
|
{
|
||||||
return (boost::posix_time::microsec_clock::universal_time() -
|
return std::chrono::duration_cast<std::chrono::microseconds>(
|
||||||
boost::posix_time::ptime(boost::gregorian::date(1970,1,1))).total_microseconds();
|
std::chrono::system_clock::now().time_since_epoch()).count();
|
||||||
}
|
}
|
||||||
|
|
||||||
void MilliSleep(int64_t n)
|
void MilliSleep(int64_t n)
|
||||||
|
|
Loading…
Reference in New Issue