Skip to content

Commit d9b8ff9

Browse files
authored
Fix API breaking change of Executor::add_node (backport #3080) (#3190)
1 parent 6b7fbfd commit d9b8ff9

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

hardware_interface_testing/test/test_resource_manager.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "hardware_interface/actuator_interface.hpp"
3030
#include "hardware_interface/types/lifecycle_state_names.hpp"
3131
#include "lifecycle_msgs/msg/state.hpp"
32+
#include "rclcpp/version.h"
3233
#include "rclcpp_lifecycle/state.hpp"
3334
#include "ros2_control_test_assets/descriptions.hpp"
3435
#include "ros2_control_test_assets/test_hardware_interface_constants.hpp"
@@ -1369,14 +1370,17 @@ class MockExecutor : public rclcpp::executors::SingleThreadedExecutor
13691370
: rclcpp::executors::SingleThreadedExecutor(options)
13701371
{
13711372
}
1372-
1373+
#if RCLCPP_VERSION_GTE(30, 1, 5)
1374+
void add_node(
1375+
const rclcpp::node_interfaces::NodeBaseInterface::SharedPtr & node_ptr, bool notify) override
1376+
#else
13731377
void add_node(
13741378
rclcpp::node_interfaces::NodeBaseInterface::SharedPtr node_ptr, bool notify) override
1379+
#endif
13751380
{
13761381
rclcpp::executors::SingleThreadedExecutor::add_node(node_ptr, notify);
13771382
added_node_names.push_back(node_ptr->get_name());
13781383
}
1379-
13801384
std::vector<std::string> added_node_names;
13811385
};
13821386

0 commit comments

Comments
 (0)