Rebase from 'release/noetic/message_tf_frame_transformer'

ika-rwth-aachen · Mar 18, 2024 · 0f435cd · 0f435cd
1 parent 52b80cb
commit 0f435cd
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 114 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package message_tf_frame_transformer
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.1.1 (2024-03-19)
+------------------
+* Merge pull request #3 from clalancette/clalancette/fix-compile-error
+  Fix a compile error with modern rclcpp.
+* Contributors: Lennart Reiher
+
 1.1.0 (2023-06-10)
 ------------------
 * integrate docker-ros

diff --git a/debian/changelog.em b/debian/changelog.em
diff --git a/debian/compat.em b/debian/compat.em
diff --git a/debian/control.em b/debian/control.em
diff --git a/debian/copyright.em b/debian/copyright.em
diff --git a/debian/gbp.conf.em b/debian/gbp.conf.em
diff --git a/debian/rules.em b/debian/rules.em
diff --git a/debian/source/format.em b/debian/source/format.em
diff --git a/debian/source/options.em b/debian/source/options.em
diff --git a/include/message_tf_frame_transformer/MessageTfFrameTransformer.ros2.hpp b/include/message_tf_frame_transformer/MessageTfFrameTransformer.ros2.hpp
@@ -66,7 +66,7 @@ class MessageTfFrameTransformer : public rclcpp::Node {
 
   void detectMessageType();
 
-  void transformGeneric(const std::shared_ptr<rclcpp::SerializedMessage>& serialized_msg);
+  void transformGeneric(const std::shared_ptr<const rclcpp::SerializedMessage>& serialized_msg);
 
   template <typename T>
   void transform(const T& msg);
@@ -98,7 +98,7 @@ class MessageTfFrameTransformer : public rclcpp::Node {
   rclcpp::TimerBase::SharedPtr detect_message_type_timer_;
 
   rclcpp::GenericSubscription::SharedPtr subscriber_;
-  
+
   rclcpp::PublisherBase::SharedPtr publisher_;
 
   std::string msg_type_;

diff --git a/package.xml b/package.xml
@@ -2,7 +2,7 @@
 <package format="3">
 
   <name>message_tf_frame_transformer</name>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
   <description>Transforms messages of arbitrary type to a different frame using tf2::doTransform</description>
 
   <maintainer email="[email protected]">Lennart Reiher</maintainer>

diff --git a/src/MessageTfFrameTransformer.ros2.cpp b/src/MessageTfFrameTransformer.ros2.cpp
@@ -138,7 +138,7 @@ void MessageTfFrameTransformer::detectMessageType() {
 }
 
 
-void MessageTfFrameTransformer::transformGeneric(const std::shared_ptr<rclcpp::SerializedMessage>& serialized_msg) {
+void MessageTfFrameTransformer::transformGeneric(const std::shared_ptr<const rclcpp::SerializedMessage>& serialized_msg) {
 
   if (false) {}
 #define MESSAGE_TYPE(TYPE, NAME)                                               \