diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-05-04 09:10:57 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-05-04 09:30:04 +0200 |
| commit | 7f5d7e9d6d85020c5dbb8f985ecaf8d176d5255d (patch) | |
| tree | 7741575ce51949d5685b9058d832baeffd840bde /src/utiltime.cpp | |
| parent | qt: English translation update before enabling translation for 0.11 (diff) | |
| parent | Trivial: useless cast (ptime)(I'm ptime) (diff) | |
| download | discoin-7f5d7e9d6d85020c5dbb8f985ecaf8d176d5255d.tar.xz discoin-7f5d7e9d6d85020c5dbb8f985ecaf8d176d5255d.zip | |
Merge pull request #6086
d3c09ba Trivial: useless cast (ptime)(I'm ptime) (svost)
Diffstat (limited to 'src/utiltime.cpp')
| -rw-r--r-- | src/utiltime.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/utiltime.cpp b/src/utiltime.cpp index 8f0dcae29..d31628899 100644 --- a/src/utiltime.cpp +++ b/src/utiltime.cpp @@ -30,13 +30,13 @@ void SetMockTime(int64_t nMockTimeIn) int64_t GetTimeMillis() { - return (boost::posix_time::ptime(boost::posix_time::microsec_clock::universal_time()) - + return (boost::posix_time::microsec_clock::universal_time() - boost::posix_time::ptime(boost::gregorian::date(1970,1,1))).total_milliseconds(); } int64_t GetTimeMicros() { - return (boost::posix_time::ptime(boost::posix_time::microsec_clock::universal_time()) - + return (boost::posix_time::microsec_clock::universal_time() - boost::posix_time::ptime(boost::gregorian::date(1970,1,1))).total_microseconds(); } |