Skip to content

Commit

Permalink
Merge branch 'ros2:rolling' into rolling
Browse files Browse the repository at this point in the history
  • Loading branch information
imstevenpmwork authored Sep 16, 2024
2 parents 0e3a8c5 + aa69da9 commit e935806
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions rmw_zenoh_cpp/src/rmw_zenoh.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1693,6 +1693,8 @@ rmw_subscription_set_content_filter(
rmw_subscription_t * subscription,
const rmw_subscription_content_filter_options_t * options)
{
// Re-enable test in rclcpp when this feature is implemented
// https://github.com/ros2/rclcpp/pull/2627
static_cast<void>(subscription);
static_cast<void>(options);
return RMW_RET_UNSUPPORTED;
Expand All @@ -1706,6 +1708,8 @@ rmw_subscription_get_content_filter(
rcutils_allocator_t * allocator,
rmw_subscription_content_filter_options_t * options)
{
// Re-enable test in rclcpp when this feature is implemented
// https://github.com/ros2/rclcpp/pull/2627
static_cast<void>(subscription);
static_cast<void>(allocator);
static_cast<void>(options);
Expand Down

0 comments on commit e935806

Please sign in to comment.