Merge remote-tracking branch 'origin/rolling' into ahcorde/dev/1.0.0-cpp

ros2 · Dec 13, 2024 · fbb49a0 · fbb49a0
2 parents 6128468 + dd82e84
commit fbb49a0
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/rmw_zenoh_cpp/src/detail/rmw_subscription_data.cpp b/rmw_zenoh_cpp/src/detail/rmw_subscription_data.cpp
@@ -16,6 +16,7 @@
 
 #include <fastcdr/FastBuffer.h>
 
+#include <chrono>
 #include <cinttypes>
 #include <limits>
 #include <memory>
@@ -224,7 +225,7 @@ bool SubscriptionData::init()
         sub_data->add_new_message(
           std::make_unique<SubscriptionData::Message>(
             sample.get_payload().clone(),
-            sample.get_timestamp().value().get_time(),
+            std::chrono::system_clock::now().time_since_epoch().count(),
             std::move(attachment_data)),
           std::string(sample.get_keyexpr().as_string_view()));
       },
@@ -310,7 +311,7 @@ bool SubscriptionData::init()
         sub_data->add_new_message(
           std::make_unique<SubscriptionData::Message>(
             sample.get_payload().clone(),
-            sample.get_timestamp().value().get_time(),
+            std::chrono::system_clock::now().time_since_epoch().count(),
             std::move(attachment_data)),
           std::string(keystr.as_string_view()));
       },