chore: adapt the latest change

ros2 · Oct 2, 2024 · d022967 · d022967
1 parent 979896a
commit d022967
Show file tree

Hide file tree

Showing 11 changed files with 120 additions and 217 deletions.
diff --git a/rmw_zenoh_cpp/src/detail/graph_cache.hpp b/rmw_zenoh_cpp/src/detail/graph_cache.hpp
@@ -23,7 +23,6 @@
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
-#include <vector>
 
 #include "event.hpp"
 #include "liveliness_utils.hpp"

diff --git a/rmw_zenoh_cpp/src/detail/rmw_context_impl_s.cpp b/rmw_zenoh_cpp/src/detail/rmw_context_impl_s.cpp
@@ -20,7 +20,6 @@
 #include <thread>
 #include <utility>
 
-#include "guard_condition.hpp"
 #include "identifier.hpp"
 #include "liveliness_utils.hpp"
 #include "logging_macros.hpp"
@@ -29,7 +28,6 @@
 
 #include "rcpputils/scope_exit.hpp"
 #include "rmw/error_handling.h"
-#include "rmw/impl/cpp/macros.hpp"
 
 // Megabytes of SHM to reserve.
 // TODO(clalancette): Make this configurable, or get it from the configuration

diff --git a/rmw_zenoh_cpp/src/detail/rmw_context_impl_s.hpp b/rmw_zenoh_cpp/src/detail/rmw_context_impl_s.hpp
@@ -26,12 +26,8 @@
 
 #include "graph_cache.hpp"
 #include "guard_condition.hpp"
-#include "liveliness_utils.hpp"
 #include "rmw_node_data.hpp"
 
-#include "rcutils/types.h"
-#include "rmw/rmw.h"
-
 ///=============================================================================
 class rmw_context_impl_s final
 {

diff --git a/rmw_zenoh_cpp/src/detail/rmw_node_data.cpp b/rmw_zenoh_cpp/src/detail/rmw_node_data.cpp
@@ -121,7 +121,7 @@ std::size_t NodeData::id() const
 ///=============================================================================
 bool NodeData::create_pub_data(
   const rmw_publisher_t * const publisher,
-  z_session_t session,
+  const z_loaned_session_t * session,
   std::size_t id,
   const std::string & topic_name,
   const rosidl_message_type_support_t * type_support,

diff --git a/rmw_zenoh_cpp/src/detail/rmw_node_data.hpp b/rmw_zenoh_cpp/src/detail/rmw_node_data.hpp
@@ -26,8 +26,6 @@
 #include "liveliness_utils.hpp"
 #include "rmw_publisher_data.hpp"
 
-#include "rmw/rmw.h"
-
 namespace rmw_zenoh_cpp
 {
 ///=============================================================================
@@ -51,7 +49,7 @@ class NodeData final
   // Create a new PublisherData for a publisher in this node.
   bool create_pub_data(
     const rmw_publisher_t * const publisher,
-    z_session_t session,
+    const z_loaned_session_t * session,
     std::size_t id,
     const std::string & topic_name,
     const rosidl_message_type_support_t * type_support,