From 7bd26a94580bf65f94d3bdd848d1e11325c57681 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 26 Sep 2017 15:52:03 +0200 Subject: [PATCH] [DEV] update count in time --- echrono/Clock.cpp | 2 +- echrono/Steady.cpp | 5 +++++ echrono/Steady.hpp | 5 ----- echrono/Time.hpp | 6 ++++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/echrono/Clock.cpp b/echrono/Clock.cpp index 860c6d3..56e50ee 100644 --- a/echrono/Clock.cpp +++ b/echrono/Clock.cpp @@ -94,7 +94,7 @@ echrono::Clock echrono::Clock::operator- (const echrono::Duration& _obj) const { } echrono::Duration echrono::Clock::operator- (const echrono::Clock& _obj) const { - return _obj.m_data - m_data; + return echrono::Duration(int64_t(m_data - _obj.m_data)); } void echrono::Clock::reset() { diff --git a/echrono/Steady.cpp b/echrono/Steady.cpp index 1b57cfa..ba8cefd 100644 --- a/echrono/Steady.cpp +++ b/echrono/Steady.cpp @@ -55,6 +55,11 @@ echrono::Steady::Steady(int64_t _valSec, int32_t _valNano) : } +echrono::Steady::Steady(const echrono::Steady& _obj) : + m_data(_obj.m_data) { + +} + echrono::Steady echrono::Steady::now() { return echrono::Steady(getTime()); } diff --git a/echrono/Steady.hpp b/echrono/Steady.hpp index a9b449f..4df5601 100644 --- a/echrono/Steady.hpp +++ b/echrono/Steady.hpp @@ -26,11 +26,6 @@ namespace echrono { int64_t get() const { return m_data; } - /** - * @brief return the number of us since start program (can be <0) - * @return a number un us since start - */ - int64_t count(); static Steady now(); const Steady& operator= (const echrono::Steady& _obj ); bool operator== (const echrono::Steady& _obj) const; diff --git a/echrono/Time.hpp b/echrono/Time.hpp index ff5ab64..d576e1d 100644 --- a/echrono/Time.hpp +++ b/echrono/Time.hpp @@ -28,9 +28,11 @@ namespace echrono { } /** * @brief return the number od us since epoch (can be <0) - * @return a number un µs since epoch + * @return a number in us since epoch */ - int64_t count(); + int64_t count() { + return get()/1000; + } /** * @brief get the current time */