From 9e309db793a7038c6bc3449fa207196d070cb755 Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Mon, 12 Dec 2016 14:59:18 -0800 Subject: [PATCH] use rosidl_typesupport_c --- rclcpp/test/test_externally_defined_services.cpp | 8 ++++---- rclcpp_lifecycle/src/lifecycle_node_interface_impl.hpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rclcpp/test/test_externally_defined_services.cpp b/rclcpp/test/test_externally_defined_services.cpp index efd05db..fc431b4 100644 --- a/rclcpp/test/test_externally_defined_services.cpp +++ b/rclcpp/test/test_externally_defined_services.cpp @@ -83,8 +83,8 @@ TEST_F(TestExternallyDefinedServices, extern_defined_initialized) { // mock for externally defined service rcl_service_t service_handle = rcl_get_zero_initialized_service(); rcl_service_options_t service_options = rcl_service_get_default_options(); - const rosidl_service_type_support_t * ts = ROSIDL_GET_TYPE_SUPPORT( - rclcpp, srv, Mock); + const rosidl_service_type_support_t * ts = + rosidl_typesupport_cpp::get_service_type_support_handle(); rcl_ret_t ret = rcl_service_init( &service_handle, node_handle->get_node_base_interface()->get_rcl_node_handle(), @@ -114,8 +114,8 @@ TEST_F(TestExternallyDefinedServices, extern_defined_destructor) { // mock for externally defined service rcl_service_t service_handle = rcl_get_zero_initialized_service(); rcl_service_options_t service_options = rcl_service_get_default_options(); - const rosidl_service_type_support_t * ts = ROSIDL_GET_TYPE_SUPPORT( - rclcpp, srv, Mock); + const rosidl_service_type_support_t * ts = + rosidl_typesupport_cpp::get_service_type_support_handle(); rcl_ret_t ret = rcl_service_init( &service_handle, node_handle->get_node_base_interface()->get_rcl_node_handle(), diff --git a/rclcpp_lifecycle/src/lifecycle_node_interface_impl.hpp b/rclcpp_lifecycle/src/lifecycle_node_interface_impl.hpp index ea66d4a..ae718e5 100644 --- a/rclcpp_lifecycle/src/lifecycle_node_interface_impl.hpp +++ b/rclcpp_lifecycle/src/lifecycle_node_interface_impl.hpp @@ -81,7 +81,7 @@ public: // Services are handled in C++, so that it needs a C++ typesupport structure. rcl_ret_t ret = rcl_lifecycle_state_machine_init( &state_machine_, node_base_interface_->get_rcl_node_handle(), - ROSIDL_GET_TYPE_SUPPORT(lifecycle_msgs, msg, TransitionEvent), + ROSIDL_GET_MSG_TYPE_SUPPORT(lifecycle_msgs, msg, TransitionEvent), rosidl_typesupport_cpp::get_service_type_support_handle(), rosidl_typesupport_cpp::get_service_type_support_handle(), rosidl_typesupport_cpp::get_service_type_support_handle(),