Use armarx::{DateTime, Duration} as armem::{Time, Duration}

source/RobotAPI/libraries/armem/core/Time.cpp

@@ -11,12 +11,12 @@ namespace armarx
     std::string armem::toStringMilliSeconds(const Time& time, int decimals)
     {
         std::stringstream ss;
-        ss << time.toMilliSeconds();
+        ss << time.toMicroSecondsSinceEpoch();
         if (decimals > 0)
         {
             int div = int(std::pow(10, 3 - decimals));
             ss << "." << std::setfill('0') << std::setw(decimals)
-               << (time.toMicroSeconds() % 1000) / div;
+               << (time.toMicroSecondsSinceEpoch() % 1000) / div;
         }
         ss << " ms";
         return ss.str();
@@ -27,7 +27,7 @@ namespace armarx
     {
         static const char* mu = "\u03BC";
         std::stringstream ss;
-        ss << time.toMicroSeconds() << " " << mu << "s";
+        ss << time.toMicroSecondsSinceEpoch() << " " << mu << "s";
         return ss.str();
     }
 
@@ -40,7 +40,7 @@ namespace armarx
         {
             int div = int(std::pow(10, 6 - decimals));
             ss << "." << std::setfill('0') << std::setw(decimals)
-               << (time.toMicroSeconds() % int(1e6)) / div;
+               << (time.toMicroSecondsSinceEpoch() % int(1e6)) / div;
         }
 
         return ss.str();
@@ -49,7 +49,7 @@ namespace armarx
 
     armem::Time armem::timeFromStringMicroSeconds(const std::string& microSeconds)
     {
-        return Time::microSeconds(std::stol(microSeconds));
+        return Time(Duration::MicroSeconds(std::stol(microSeconds)), ClockType::Virtual);
     }
 
 }

source/RobotAPI/libraries/armem/core/Time.h

@@ -2,13 +2,14 @@
 
 #include <string>
 
-#include <IceUtil/Time.h>
+#include <ArmarXCore/core/time/DateTime.h>
+#include <ArmarXCore/core/time/Duration.h>
+
+#include "forward_declarations.h"
 
 
 namespace armarx::armem
 {
-    using Time = IceUtil::Time;
-    using Duration = IceUtil::Time;
 
     /**
      * @brief Returns `time` as e.g. "123456789.012 ms".

source/RobotAPI/libraries/armem/core/forward_declarations.h

 #pragma once
 
+#include <ArmarXCore/core/time/forward_declarations.h>
 
-namespace IceUtil
 {
-    class Time;
 }
 
 namespace armarx::armem
 {
-    using Time = IceUtil::Time;
-    using Duration = IceUtil::Time;
+    using Time = armarx::core::time::DateTime;
+    using Duration = armarx::core::time::Duration;
 
     class MemoryID;
     class Commit;