fix: use the default destructor that automatically drops the zenoh re…

…ply/query and hence sends the final signal (#473) (#474) (cherry picked from commit 4fc36b7) Co-authored-by: Yuyuan Yuan <az6980522@gmail.com>
ros2 · Feb 20, 2025 · ecf21d4 · ecf21d4
1 parent c298581
commit ecf21d4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/rmw_zenoh_cpp/src/detail/zenoh_utils.cpp b/rmw_zenoh_cpp/src/detail/zenoh_utils.cpp
@@ -41,9 +41,6 @@ std::chrono::nanoseconds::rep ZenohQuery::get_received_timestamp() const
   return received_timestamp_;
 }
 
-///=============================================================================
-ZenohQuery::~ZenohQuery() {}
-
 ///=============================================================================
 const zenoh::Query & ZenohQuery::get_query() const {return query_;}
 
@@ -56,9 +53,6 @@ ZenohReply::ZenohReply(
   received_timestamp_ = received_timestamp;
 }
 
-///=============================================================================
-ZenohReply::~ZenohReply() {}
-
 ///=============================================================================
 const zenoh::Reply & ZenohReply::get_sample() const
 {

diff --git a/rmw_zenoh_cpp/src/detail/zenoh_utils.hpp b/rmw_zenoh_cpp/src/detail/zenoh_utils.hpp
@@ -36,7 +36,7 @@ class ZenohReply final
 public:
   ZenohReply(const zenoh::Reply & reply, std::chrono::nanoseconds::rep received_timestamp);
 
-  ~ZenohReply();
+  ~ZenohReply() = default;
 
   const zenoh::Reply & get_sample() const;
 
@@ -54,7 +54,7 @@ class ZenohQuery final
 public:
   ZenohQuery(const zenoh::Query & query, std::chrono::nanoseconds::rep received_timestamp);
 
-  ~ZenohQuery();
+  ~ZenohQuery() = default;
 
   const zenoh::Query & get_query() const;