From d024950d26377603bdf8df8ea9e00befe2538b4f Mon Sep 17 00:00:00 2001 From: Chen Lihui Date: Mon, 11 Oct 2021 13:09:05 +0800 Subject: [PATCH] Update interface Signed-off-by: Chen Lihui --- rmw_cyclonedds_cpp/src/rmw_node.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/rmw_cyclonedds_cpp/src/rmw_node.cpp b/rmw_cyclonedds_cpp/src/rmw_node.cpp index 8489a57d..7220f902 100644 --- a/rmw_cyclonedds_cpp/src/rmw_node.cpp +++ b/rmw_cyclonedds_cpp/src/rmw_node.cpp @@ -2887,7 +2887,7 @@ static rmw_subscription_t * create_subscription( memcpy(const_cast(rmw_subscription->topic_name), topic_name, strlen(topic_name) + 1); rmw_subscription->options = *subscription_options; rmw_subscription->can_loan_messages = sub->is_loaning_available; - rmw_subscription->is_cft_supported = false; + rmw_subscription->is_cft_enabled = false; cleanup_subscription.cancel(); cleanup_rmw_subscription.cancel(); @@ -3015,12 +3015,10 @@ extern "C" rmw_ret_t rmw_subscription_get_actual_qos( extern "C" rmw_ret_t rmw_subscription_set_cft_expression_parameters( rmw_subscription_t * subscription, - const char * filter_expression, - const rcutils_string_array_t * expression_parameters) + const rmw_subscription_content_filtered_topic_options_t * options) { static_cast(subscription); - static_cast(filter_expression); - static_cast(expression_parameters); + static_cast(options); RMW_SET_ERROR_MSG("rmw_subscription_set_cft_expression_parameters: unimplemented"); return RMW_RET_UNSUPPORTED; @@ -3028,12 +3026,12 @@ extern "C" rmw_ret_t rmw_subscription_set_cft_expression_parameters( extern "C" rmw_ret_t rmw_subscription_get_cft_expression_parameters( const rmw_subscription_t * subscription, - char ** filter_expression, - rcutils_string_array_t * expression_parameters) + rcutils_allocator_t * allocator, + rmw_subscription_content_filtered_topic_options_t * options) { static_cast(subscription); - static_cast(filter_expression); - static_cast(expression_parameters); + static_cast(allocator); + static_cast(options); RMW_SET_ERROR_MSG("rmw_subscription_get_cft_expression_parameters: unimplemented"); return RMW_RET_UNSUPPORTED;