Call get_type_hash_func (#680)

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>
ros2 · Apr 6, 2023 · 851ced8 · 851ced8
1 parent 901339f
commit 851ced8
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 12 deletions.
diff --git a/rmw_fastrtps_cpp/src/publisher.cpp b/rmw_fastrtps_cpp/src/publisher.cpp
@@ -256,7 +256,10 @@ rmw_fastrtps_cpp::create_publisher(
   }
 
   // Get QoS from RMW
-  if (!get_datawriter_qos(*qos_policies, *type_supports->type_hash, writer_qos)) {
+  if (!get_datawriter_qos(
+      *qos_policies, *type_supports->get_type_hash_func(type_supports),
+      writer_qos))
+  {
     RMW_SET_ERROR_MSG("create_publisher() failed setting data writer QoS");
     return nullptr;
   }

diff --git a/rmw_fastrtps_cpp/src/rmw_client.cpp b/rmw_fastrtps_cpp/src/rmw_client.cpp
@@ -315,7 +315,9 @@ rmw_create_client(
   }
 
   if (!get_datareader_qos(
-      adapted_qos_policies, *type_supports->response_typesupport->type_hash, reader_qos))
+      adapted_qos_policies,
+      *type_supports->response_typesupport->get_type_hash_func(type_supports->response_typesupport),
+      reader_qos))
   {
     RMW_SET_ERROR_MSG("create_client() failed setting response DataReader QoS");
     return nullptr;
@@ -371,7 +373,9 @@ rmw_create_client(
   }
 
   if (!get_datawriter_qos(
-      adapted_qos_policies, *type_supports->request_typesupport->type_hash, writer_qos))
+      adapted_qos_policies,
+      *type_supports->request_typesupport->get_type_hash_func(type_supports->request_typesupport),
+      writer_qos))
   {
     RMW_SET_ERROR_MSG("create_client() failed setting request DataWriter QoS");
     return nullptr;

diff --git a/rmw_fastrtps_cpp/src/rmw_service.cpp b/rmw_fastrtps_cpp/src/rmw_service.cpp
@@ -314,7 +314,9 @@ rmw_create_service(
   }
 
   if (!get_datareader_qos(
-      adapted_qos_policies, *type_supports->request_typesupport->type_hash, reader_qos))
+      adapted_qos_policies,
+      *type_supports->request_typesupport->get_type_hash_func(type_supports->request_typesupport),
+      reader_qos))
   {
     RMW_SET_ERROR_MSG("create_service() failed setting request DataReader QoS");
     return nullptr;
@@ -374,7 +376,9 @@ rmw_create_service(
   }
 
   if (!get_datawriter_qos(
-      adapted_qos_policies, *type_supports->response_typesupport->type_hash, writer_qos))
+      adapted_qos_policies,
+      *type_supports->response_typesupport->get_type_hash_func(type_supports->response_typesupport),
+      writer_qos))
   {
     RMW_SET_ERROR_MSG("create_service() failed setting response DataWriter QoS");
     return nullptr;

diff --git a/rmw_fastrtps_cpp/src/subscription.cpp b/rmw_fastrtps_cpp/src/subscription.cpp
@@ -280,7 +280,10 @@ create_subscription(
     reader_qos.data_sharing().off();
   }
 
-  if (!get_datareader_qos(*qos_policies, *type_supports->type_hash, reader_qos)) {
+  if (!get_datareader_qos(
+      *qos_policies, *type_supports->get_type_hash_func(type_supports),
+      reader_qos))
+  {
     RMW_SET_ERROR_MSG("create_subscription() failed setting data reader QoS");
     return nullptr;
   }

diff --git a/rmw_fastrtps_dynamic_cpp/src/publisher.cpp b/rmw_fastrtps_dynamic_cpp/src/publisher.cpp
@@ -262,7 +262,10 @@ rmw_fastrtps_dynamic_cpp::create_publisher(
   }
 
   // Get QoS from RMW
-  if (!get_datawriter_qos(*qos_policies, *type_supports->type_hash, writer_qos)) {
+  if (!get_datawriter_qos(
+      *qos_policies, *type_supports->get_type_hash_func(type_supports),
+      writer_qos))
+  {
     RMW_SET_ERROR_MSG("create_publisher() failed setting data writer QoS");
     return nullptr;
   }

diff --git a/rmw_fastrtps_dynamic_cpp/src/rmw_client.cpp b/rmw_fastrtps_dynamic_cpp/src/rmw_client.cpp
@@ -346,7 +346,9 @@ rmw_create_client(
   }
 
   if (!get_datareader_qos(
-      adapted_qos_policies, *type_supports->response_typesupport->type_hash, reader_qos))
+      adapted_qos_policies,
+      *type_supports->response_typesupport->get_type_hash_func(type_supports->response_typesupport),
+      reader_qos))
   {
     RMW_SET_ERROR_MSG("create_client() failed setting response DataReader QoS");
     return nullptr;
@@ -402,7 +404,9 @@ rmw_create_client(
   }
 
   if (!get_datawriter_qos(
-      adapted_qos_policies, *type_supports->request_typesupport->type_hash, writer_qos))
+      adapted_qos_policies,
+      *type_supports->request_typesupport->get_type_hash_func(type_supports->request_typesupport),
+      writer_qos))
   {
     RMW_SET_ERROR_MSG("create_client() failed setting request DataWriter QoS");
     return nullptr;

diff --git a/rmw_fastrtps_dynamic_cpp/src/rmw_service.cpp b/rmw_fastrtps_dynamic_cpp/src/rmw_service.cpp
@@ -345,7 +345,9 @@ rmw_create_service(
   }
 
   if (!get_datareader_qos(
-      adapted_qos_policies, *type_supports->request_typesupport->type_hash, reader_qos))
+      adapted_qos_policies,
+      *type_supports->request_typesupport->get_type_hash_func(type_supports->request_typesupport),
+      reader_qos))
   {
     RMW_SET_ERROR_MSG("create_service() failed setting request DataReader QoS");
     return nullptr;
@@ -405,7 +407,9 @@ rmw_create_service(
   }
 
   if (!get_datawriter_qos(
-      adapted_qos_policies, *type_supports->response_typesupport->type_hash, writer_qos))
+      adapted_qos_policies,
+      *type_supports->response_typesupport->get_type_hash_func(type_supports->response_typesupport),
+      writer_qos))
   {
     RMW_SET_ERROR_MSG("create_service() failed setting response DataWriter QoS");
     return nullptr;

diff --git a/rmw_fastrtps_dynamic_cpp/src/subscription.cpp b/rmw_fastrtps_dynamic_cpp/src/subscription.cpp
@@ -266,7 +266,10 @@ create_subscription(
     reader_qos.data_sharing().off();
   }
 
-  if (!get_datareader_qos(*qos_policies, *type_supports->type_hash, reader_qos)) {
+  if (!get_datareader_qos(
+      *qos_policies, *type_supports->get_type_hash_func(type_supports),
+      reader_qos))
+  {
     RMW_SET_ERROR_MSG("create_subscription() failed setting data reader QoS");
     return nullptr;
   }