clean merge

Signed-off-by: Alejandro Hernández Cordero <[email protected]>
ros2 · Dec 9, 2024 · 3b6fb80 · 3b6fb80
1 parent 23f4235
commit 3b6fb80
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/rmw_zenoh_cpp/src/detail/rmw_client_data.cpp b/rmw_zenoh_cpp/src/detail/rmw_client_data.cpp
@@ -269,6 +269,7 @@ bool ClientData::init(const z_loaned_session_t * session)
   initialized_ = true;
 
   free_ros_keyexpr.cancel();
+  free_token.cancel();
 
   return true;
 }

diff --git a/rmw_zenoh_cpp/src/rmw_zenoh.cpp b/rmw_zenoh_cpp/src/rmw_zenoh.cpp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include <fastcdr/FastBuffer.h>
+
 #include <zenoh.h>
 
 #include <chrono>