Switch epoch time functions to system_clock

Alpslee · Mar 1, 2018 · d47d421 · d47d421
1 parent a24bfe2
commit d47d421
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/AirLib/include/common/ScalableClock.hpp b/AirLib/include/common/ScalableClock.hpp
@@ -66,8 +66,6 @@ class ScalableClock : public ClockBase {
 
 
 private:
-    typedef std::chrono::high_resolution_clock clock;
-
     double scale_;
     TTimeDelta latency_;
     double offset_;

diff --git a/AirLib/include/common/common_utils/Utils.hpp b/AirLib/include/common/common_utils/Utils.hpp
@@ -524,15 +524,18 @@ class Utils {
     }
 
     //high precision time in seconds since epoch
-    static double getTimeSinceEpochSecs(std::chrono::high_resolution_clock::time_point* t = nullptr)
+    static double getTimeSinceEpochSecs(std::chrono::system_clock::time_point* t = nullptr)
     {
-        using Clock = std::chrono::high_resolution_clock;
+        using Clock = std::chrono::system_clock; //high res clock has epoch since boot instead of since 1970 for VC++
         return std::chrono::duration<double>((t != nullptr ? *t : Clock::now() ).time_since_epoch()).count();
     }
-    static uint64_t getTimeSinceEpochNanos(std::chrono::high_resolution_clock::time_point* t = nullptr)
+    static uint64_t getTimeSinceEpochNanos(std::chrono::system_clock::time_point* t = nullptr)
     {
-        using Clock = std::chrono::high_resolution_clock;
-        return static_cast<uint64_t>((t != nullptr ? *t : Clock::now() ).time_since_epoch().count());
+        using Clock = std::chrono::system_clock; //high res clock has epoch since boot instead of since 1970 for VC++
+        return std::chrono::duration_cast<std::chrono::nanoseconds>(
+            (t != nullptr ? *t : Clock::now())
+                .time_since_epoch()).
+            count();  
     }
 
     template<typename T>