Use dynamic typesupport identifier getter

Signed-off-by: methylDragon <[email protected]>
ros2 · Apr 4, 2023 · 2217287 · 2217287
1 parent ca17caf
commit 2217287
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/rclcpp/include/rclcpp/dynamic_subscription.hpp b/rclcpp/include/rclcpp/dynamic_subscription.hpp
@@ -80,7 +80,7 @@ class DynamicSubscription : public rclcpp::SubscriptionBase
     }
 
     if (type_support->get_rosidl_message_type_support()->typesupport_identifier !=
-      rmw_dynamic_typesupport_c__identifier)
+      rmw_get_dynamic_typesupport_identifier())
     {
       throw std::runtime_error(
               "DynamicSubscription must use dynamic type introspection type support!");

diff --git a/rclcpp/src/rclcpp/dynamic_typesupport/dynamic_message_type_support.cpp b/rclcpp/src/rclcpp/dynamic_typesupport/dynamic_message_type_support.cpp
@@ -70,7 +70,7 @@ DynamicMessageTypeSupport::DynamicMessageTypeSupport(
   if (!ts->data) {
     throw std::runtime_error("could not init rosidl message type support impl");
   }
-  if (ts->typesupport_identifier != rmw_dynamic_typesupport_c__identifier) {
+  if (ts->typesupport_identifier != rmw_get_dynamic_typesupport_identifier()) {
     throw std::runtime_error("rosidl message type support is of the wrong type");
   }
 
@@ -132,7 +132,7 @@ DynamicMessageTypeSupport::DynamicMessageTypeSupport(
   if (!ts->data) {
     throw std::runtime_error("could not init rosidl message type support impl");
   }
-  if (ts->typesupport_identifier != rmw_dynamic_typesupport_c__identifier) {
+  if (ts->typesupport_identifier != rmw_get_dynamic_typesupport_identifier()) {
     throw std::runtime_error("rosidl message type support is of the wrong type");
   }
 
@@ -316,7 +316,7 @@ DynamicMessageTypeSupport::init_rosidl_message_type_support_(
   //                     are managed by the passed in SharedPtr wrapper classes. We just delete it.
   rosidl_message_type_support_.reset(
     new rosidl_message_type_support_t{
-    rmw_dynamic_typesupport_c__identifier,                // typesupport_identifier
+    rmw_get_dynamic_typesupport_identifier(),             // typesupport_identifier
     ts_impl,                                              // data
     get_message_typesupport_handle_function,              // func
      // get_type_hash_func