Fix macOS build (#90)

* Fix dependency of name conversion lib (#81)

Signed-off-by: Simon Hoinkis <[email protected]>

* Call correct destructor (#81)

Signed-off-by: Simon Hoinkis <[email protected]>

---------

Signed-off-by: Simon Hoinkis <[email protected]>

Author: mossmaurice-apexai

rmw_iceoryx_cpp/CMakeLists.txt

@@ -38,6 +38,7 @@ find_package(rosidl_typesupport_introspection_cpp REQUIRED)
 add_library(rmw_iceoryx_serialization SHARED
   src/internal/iceoryx_deserialize.cpp
   src/internal/iceoryx_serialize.cpp
+  src/internal/iceoryx_type_info_introspection.cpp
 )
 target_include_directories(rmw_iceoryx_serialization
   PUBLIC include
@@ -50,7 +51,6 @@ ament_target_dependencies(rmw_iceoryx_serialization
 )
 add_library(rmw_iceoryx_name_conversion SHARED
   src/internal/iceoryx_name_conversion.cpp
-  src/internal/iceoryx_type_info_introspection.cpp
   src/internal/iceoryx_topic_names_and_types.cpp
   src/internal/iceoryx_get_topic_endpoint_info.cpp
 )
@@ -59,6 +59,7 @@ target_include_directories(rmw_iceoryx_name_conversion
 )
 target_link_libraries(rmw_iceoryx_name_conversion
   iceoryx_posh::iceoryx_posh
+  rmw_iceoryx_serialization
 )
 ament_target_dependencies(rmw_iceoryx_name_conversion
   rcpputils

rmw_iceoryx_cpp/src/rmw_publisher.cpp

@@ -131,7 +131,7 @@ rmw_create_publisher(
   if (rmw_publisher) {
     if (iceoryx_sender) {
       RMW_TRY_DESTRUCTOR_FROM_WITHIN_FAILURE(
-        iceoryx_sender->~UntypedPublisherImpl(), iox::popo::UntypedPublisher)
+        iceoryx_sender->~UntypedPublisher(), iox::popo::UntypedPublisher)
       rmw_free(iceoryx_sender);
     }
     if (iceoryx_publisher) {
@@ -198,7 +198,7 @@ rmw_destroy_publisher(rmw_node_t * node, rmw_publisher_t * publisher)
   if (iceoryx_publisher) {
     if (iceoryx_publisher->iceoryx_sender_) {
       RMW_TRY_DESTRUCTOR(
-        iceoryx_publisher->iceoryx_sender_->~UntypedPublisherImpl(),
+        iceoryx_publisher->iceoryx_sender_->~UntypedPublisher(),
         iceoryx_publisher->iceoryx_sender_,
         result = RMW_RET_ERROR)
       rmw_free(iceoryx_publisher->iceoryx_sender_);

rmw_iceoryx_cpp/src/rmw_subscription.cpp

@@ -130,7 +130,7 @@ rmw_create_subscription(
     if (iceoryx_receiver) {
       /// @todo Can we avoid to use the impl here?
       RMW_TRY_DESTRUCTOR_FROM_WITHIN_FAILURE(
-        iceoryx_receiver->~UntypedSubscriberImpl(), iox::popo::UntypedSubscriber)
+        iceoryx_receiver->~UntypedSubscriber(), iox::popo::UntypedSubscriber)
       rmw_free(iceoryx_receiver);
     }
     if (iceoryx_subscription) {
@@ -216,7 +216,7 @@ rmw_destroy_subscription(
     if (iceoryx_subscription->iceoryx_receiver_) {
       // @todo Can we avoid to use the impl here?
       RMW_TRY_DESTRUCTOR(
-        iceoryx_subscription->iceoryx_receiver_->~UntypedSubscriberImpl(),
+        iceoryx_subscription->iceoryx_receiver_->~UntypedSubscriber(),
         iceoryx_subscription->iceoryx_receiver_,
         result = RMW_RET_ERROR)
       rmw_free(iceoryx_subscription->iceoryx_receiver_);