Merge branch 'ros2:rolling' into rolling

ZettaScaleLabs · Nov 4, 2024 · e69b318 · e69b318
2 parents 8c1b932 + 1607d83
commit e69b318
Show file tree

Hide file tree

Showing 2 changed files with 2 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
@@ -88,7 +88,7 @@ void sub_data_handler(const z_sample_t * sample, void * data)
     // isn't fatal, it is unusual and so we should report it.
     source_timestamp = 0;
     RMW_ZENOH_LOG_ERROR_NAMED(
-      "rmw_zenoh_cpp", "Unable to obtain sequence number from the attachment.");
+      "rmw_zenoh_cpp", "Unable to obtain source timestamp from the attachment.");
   }
 
   sub_data->add_new_message(

diff --git a/rmw_zenoh_cpp/src/rmw_init.cpp b/rmw_zenoh_cpp/src/rmw_init.cpp
@@ -39,7 +39,7 @@
 extern "C"
 {
 //==============================================================================
-/// Initialize the middleware with the given options, and yielding an context.
+/// Initialize the middleware with the given options, and yield a context.
 rmw_ret_t
 rmw_init(const rmw_init_options_t * options, rmw_context_t * context)
 {