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

ZettaScaleLabs · Sep 30, 2024 · afd7f63 · afd7f63
2 parents 63530b7 + 67ed661
commit afd7f63
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
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,6 +20,7 @@
 #include <thread>
 #include <utility>
 
+#include "guard_condition.hpp"
 #include "identifier.hpp"
 #include "liveliness_utils.hpp"
 #include "logging_macros.hpp"
@@ -28,6 +29,7 @@
 
 #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
@@ -25,6 +25,10 @@
 
 #include "graph_cache.hpp"
 #include "guard_condition.hpp"
+#include "liveliness_utils.hpp"
+
+#include "rcutils/types.h"
+#include "rmw/rmw.h"
 
 ///=============================================================================
 class rmw_context_impl_s final