Changeset 173:995dee26a025 in rrlib_util

Timestamp:

02.10.2020 17:39:52 (3 weeks ago)

Author:

Max Reichardt <max.reichardt@…>

Branch:

17.03

Phase:

public

Message:

Adapts to changes in rrlib_time

File:

• tTime.h (modified) (2 diffs)

tTime.h

@@ -89 +89 @@
 
   //! constructor that gets a time in seconds plus microseconds
-  tTime(const rrlib::time::tTimestamp &timestamp)
+  tTime(const rrlib::time::tSystemTimestamp &timestamp)
   {
     // 1970-01-01T00:00:00+00:00
-    const rrlib::time::tTimestamp unix_timestamp = std::chrono::system_clock::from_time_t(0);
+    const rrlib::time::tSystemTimestamp unix_timestamp = std::chrono::system_clock::from_time_t(0);
     rrlib::time::tDuration duration = timestamp - unix_timestamp;
     tv_sec = std::chrono::duration_cast <std::chrono::seconds> (duration).count();
@@ -372 +372 @@
   }
 
-  operator rrlib::time::tTimestamp() const
-  {
-    rrlib::time::tTimestamp timestamp = std::chrono::system_clock::from_time_t((time_t) this->tv_sec);
+  operator rrlib::time::tSystemTimestamp() const
+  {
+    rrlib::time::tSystemTimestamp timestamp = std::chrono::system_clock::from_time_t((time_t) this->tv_sec);
     return timestamp + std::chrono::duration_cast<rrlib::time::tDuration>(std::chrono::microseconds(this->tv_usec));
   }