to support reset content filtered topic with empty string.

remove constness for rmw_subscription because is_cft_supported might be updated Signed-off-by: Chen Lihui <[email protected]>
ros2 · Mar 12, 2021 · cb43991 · cb43991
1 parent 1925704
commit cb43991
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/rmw_fastrtps_cpp/src/rmw_subscription.cpp b/rmw_fastrtps_cpp/src/rmw_subscription.cpp
@@ -150,7 +150,7 @@ rmw_subscription_get_actual_qos(
 
 rmw_ret_t
 rmw_subscription_set_cft_expression_parameters(
-  const rmw_subscription_t * subscription,
+  rmw_subscription_t * subscription,
   const char * filter_expression,
   const rcutils_string_array_t * expression_parameters)
 {

diff --git a/rmw_fastrtps_cpp/src/subscription.cpp b/rmw_fastrtps_cpp/src/subscription.cpp
@@ -207,6 +207,7 @@ create_subscription(
   }
   rmw_subscription->options = *subscription_options;
   rmw_subscription->can_loan_messages = false;
+  rmw_subscription->is_cft_supported = false;
 
   cleanup_rmw_subscription.cancel();
   cleanup_subscription.cancel();

diff --git a/rmw_fastrtps_dynamic_cpp/src/rmw_subscription.cpp b/rmw_fastrtps_dynamic_cpp/src/rmw_subscription.cpp
@@ -153,7 +153,7 @@ rmw_subscription_get_actual_qos(
 
 rmw_ret_t
 rmw_subscription_set_cft_expression_parameters(
-  const rmw_subscription_t * subscription,
+  rmw_subscription_t * subscription,
   const char * filter_expression,
   const rcutils_string_array_t * expression_parameters)
 {

diff --git a/rmw_fastrtps_dynamic_cpp/src/subscription.cpp b/rmw_fastrtps_dynamic_cpp/src/subscription.cpp
@@ -219,6 +219,7 @@ create_subscription(
 
   rmw_subscription->options = *subscription_options;
   rmw_subscription->can_loan_messages = false;
+  rmw_subscription->is_cft_supported = false;
 
   cleanup_rmw_subscription.cancel();
   cleanup_subscription.cancel();