Call get_type_hash_func

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

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/rmw_fastrtps_cpp/src/publisher.cpp b/rmw_fastrtps_cpp/src/publisher.cpp
@@ -256,7 +256,7 @@ 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,7 @@ 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 +371,7 @@ 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,7 @@ 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 +374,7 @@ 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,7 @@ 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,7 @@ 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,7 @@ 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 +402,7 @@ 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,7 @@ 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 +405,7 @@ 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,7 @@ 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;
   }