From 077c272d14059235c2416f33dd80a5975313c2f9 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 13 Feb 2022 16:29:22 +0100 Subject: [PATCH] Base: in TimeInfo replace uint64_t with int64_t --- src/Base/TimeInfo.cpp | 4 ++-- src/Base/TimeInfo.h | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/Base/TimeInfo.cpp b/src/Base/TimeInfo.cpp index 170f596a93..8e8b163060 100644 --- a/src/Base/TimeInfo.cpp +++ b/src/Base/TimeInfo.cpp @@ -72,7 +72,7 @@ void TimeInfo::setCurrent() #endif } -void TimeInfo::setTime_t (uint64_t seconds) +void TimeInfo::setTime_t (int64_t seconds) { timebuffer.time = seconds; } @@ -95,7 +95,7 @@ float TimeInfo::diffTimeF(const TimeInfo &timeStart,const TimeInfo &timeEnd ) int64_t ds = int64_t(timeEnd.getSeconds() - timeStart.getSeconds()); int dms = int(timeEnd.getMiliseconds()) - int(timeStart.getMiliseconds()); - return float(ds) + float(dms) * 0.001; + return float(ds) + float(dms) * 0.001f; } TimeInfo TimeInfo::null() diff --git a/src/Base/TimeInfo.h b/src/Base/TimeInfo.h index 153392113d..73799ffdc9 100644 --- a/src/Base/TimeInfo.h +++ b/src/Base/TimeInfo.h @@ -59,17 +59,18 @@ class BaseExport TimeInfo public: /// Construction TimeInfo(); + TimeInfo(const TimeInfo&) = default; /// Destruction virtual ~TimeInfo(); /// sets the object to the actual system time void setCurrent(); - void setTime_t (uint64_t seconds); + void setTime_t (int64_t seconds); - uint64_t getSeconds() const; + int64_t getSeconds() const; unsigned short getMiliseconds() const; - //void operator = (const TimeInfo &time); + void operator = (const TimeInfo &time); bool operator == (const TimeInfo &time) const; bool operator != (const TimeInfo &time) const; @@ -93,7 +94,7 @@ protected: }; - inline uint64_t TimeInfo::getSeconds() const + inline int64_t TimeInfo::getSeconds() const { return timebuffer.time; } @@ -109,11 +110,11 @@ TimeInfo::operator != (const TimeInfo &time) const return (timebuffer.time != time.timebuffer.time || timebuffer.millitm != time.timebuffer.millitm); } -//inline void -//TimeInfo::operator = (const TimeInfo &time) -//{ - //timebuffer = time.timebuffer; -//} +inline void +TimeInfo::operator = (const TimeInfo &time) +{ + timebuffer = time.timebuffer; +} inline bool TimeInfo::operator == (const TimeInfo &time) const