From ba9369a8eb4780deeede83393584049ba8f52c73 Mon Sep 17 00:00:00 2001 From: William Woodall Date: Wed, 6 Jul 2016 15:32:50 -0700 Subject: [PATCH] pass node to client and service destroy funcs --- rcl/src/rcl/client.c | 2 +- rcl/src/rcl/service.c | 2 +- rcl/test/CMakeLists.txt | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rcl/src/rcl/client.c b/rcl/src/rcl/client.c index 09ec8cd781..b66fd368aa 100644 --- a/rcl/src/rcl/client.c +++ b/rcl/src/rcl/client.c @@ -103,7 +103,7 @@ rcl_client_fini(rcl_client_t * client, rcl_node_t * node) RCL_CHECK_ARGUMENT_FOR_NULL(node, RCL_RET_INVALID_ARGUMENT); if (client->impl) { rmw_ret_t ret = - rmw_destroy_client(client->impl->rmw_handle); + rmw_destroy_client(rcl_node_get_rmw_handle(node), client->impl->rmw_handle); if (ret != RMW_RET_OK) { RCL_SET_ERROR_MSG(rmw_get_error_string_safe()); result = RCL_RET_ERROR; diff --git a/rcl/src/rcl/service.c b/rcl/src/rcl/service.c index 7399069288..932003eb7c 100644 --- a/rcl/src/rcl/service.c +++ b/rcl/src/rcl/service.c @@ -99,7 +99,7 @@ rcl_service_fini(rcl_service_t * service, rcl_node_t * node) RCL_CHECK_ARGUMENT_FOR_NULL(node, RCL_RET_INVALID_ARGUMENT); if (service->impl) { rmw_ret_t ret = - rmw_destroy_service(service->impl->rmw_handle); + rmw_destroy_service(rcl_node_get_rmw_handle(node), service->impl->rmw_handle); if (ret != RMW_RET_OK) { RCL_SET_ERROR_MSG(rmw_get_error_string_safe()); result = RCL_RET_ERROR; diff --git a/rcl/test/CMakeLists.txt b/rcl/test/CMakeLists.txt index ea04bd7238..fee0689176 100644 --- a/rcl/test/CMakeLists.txt +++ b/rcl/test/CMakeLists.txt @@ -61,7 +61,10 @@ function(test_target_function) ) # TODO(wjwwood): remove this when the graph API works properly for more than OpenSplice. - if(rmw_implementation STREQUAL "rmw_opensplice_cpp") + if( + rmw_implementation STREQUAL "rmw_opensplice_cpp" + OR rmw_implementation STREQUAL "rmw_connext_cpp" + ) rcl_add_custom_gtest(test_graph${target_suffix} SRCS rcl/test_graph.cpp ENV ${extra_test_env}