Combine package name with namespace in message and service type suppo…

…rt structs Signed-off-by: Jacob Perron <[email protected]>
ros2 · May 6, 2019 · 109b387 · 109b387
1 parent 9722ce6
commit 109b387
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/rosidl_typesupport_opensplice_c/resource/msg__type_support_c.cpp.em b/rosidl_typesupport_opensplice_c/resource/msg__type_support_c.cpp.em
@@ -761,7 +761,7 @@ deserialize_@(__ros_msg_type_prefix)(
 @# // Collect the callback functions and provide a function to get the type support struct.
 
 static message_type_support_callbacks_t @(message.structure.namespaced_type.name)__callbacks = {
-  "@(package_name)",  // package_name
+  "@('::'.join([package_name] + list(interface_path.parents[0].parts)))",  // message_namespace
   "@(message.structure.namespaced_type.name)",  // message_name
   register_type_@(__ros_msg_type_prefix),  // register_type
   publish_@(__ros_msg_type_prefix),  // publish

diff --git a/rosidl_typesupport_opensplice_c/resource/srv__type_support_c.cpp.em b/rosidl_typesupport_opensplice_c/resource/srv__type_support_c.cpp.em
@@ -258,7 +258,7 @@ server_is_available__@('__'.join(service.namespaced_type.namespaced_name()))(
 }
 
 static service_type_support_callbacks_t @(service.namespaced_type.name)__callbacks = {
-  "@(package_name)",
+  "@('::'.join([package_name] + list(interface_path.parents[0].parts)))",
   "@(service.namespaced_type.name)",
   &create_requester__@('__'.join(service.namespaced_type.namespaced_name())),
   &destroy_requester__@('__'.join(service.namespaced_type.namespaced_name())),

diff --git a/...pesupport_opensplice_cpp/include/rosidl_typesupport_opensplice_cpp/message_type_support.h b/...pesupport_opensplice_cpp/include/rosidl_typesupport_opensplice_cpp/message_type_support.h
@@ -22,7 +22,7 @@
 
 typedef struct message_type_support_callbacks_t
 {
-  const char * package_name;
+  const char * message_namespace;
   const char * message_name;
   // Function to register type with given dds_participant.
   // Returns NULL if the registration was successful, otherwise an error string.

diff --git a/...pesupport_opensplice_cpp/include/rosidl_typesupport_opensplice_cpp/service_type_support.h b/...pesupport_opensplice_cpp/include/rosidl_typesupport_opensplice_cpp/service_type_support.h
@@ -24,7 +24,7 @@
 
 typedef struct service_type_support_callbacks_t
 {
-  const char * package_name;
+  const char * service_namespace;
   const char * service_name;
   // Function to create a requester
   // Returns NULL if the requester was successfully created, otherwise an error string.

diff --git a/rosidl_typesupport_opensplice_cpp/resource/msg__type_support.cpp.em b/rosidl_typesupport_opensplice_cpp/resource/msg__type_support.cpp.em
@@ -510,7 +510,7 @@ deserialize__@(message.structure.namespaced_type.name)(
 }
 
 static message_type_support_callbacks_t @(message.structure.namespaced_type.name)_callbacks = {
-  "@(package_name)",
+  "@('::'.join([package_name] + list(interface_path.parents[0].parts)))",
   "@(message.structure.namespaced_type.name)",
   &register_type__@(message.structure.namespaced_type.name),
   &publish__@(message.structure.namespaced_type.name),

diff --git a/rosidl_typesupport_opensplice_cpp/resource/srv__type_support.cpp.em b/rosidl_typesupport_opensplice_cpp/resource/srv__type_support.cpp.em
@@ -598,7 +598,7 @@ server_is_available__@(service.namespaced_type.name)(
 }
 
 static service_type_support_callbacks_t @(service.namespaced_type.name)_callbacks = {
-  "@(package_name)",
+  "@('::'.join([package_name] + list(interface_path.parents[0].parts)))",
   "@(service.namespaced_type.name)",
   &create_requester__@(service.namespaced_type.name),
   &destroy_requester__@(service.namespaced_type.name),