Skip to content

Commit 2d91d45

Browse files
committed
clang fixes
Signed-off-by: Paul Gesel <paul.gesel@picknik.ai>
1 parent 4a568d1 commit 2d91d45

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

moveit_plugins/moveit_ros_control_interface/test/test_controller_manager_plugin.cpp

+15-10
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,25 @@ class MockControllersManagerService final : public rclcpp::Node
4848
MockControllersManagerService() : Node("list_controllers_service")
4949
{
5050
list_controller_service_ = create_service<controller_manager_msgs::srv::ListControllers>(
51-
"controller_manager/list_controllers", std::bind(&MockControllersManagerService::handle_list_controllers_service,
52-
this, std::placeholders::_1, std::placeholders::_2));
51+
"controller_manager/list_controllers",
52+
[this](const std::shared_ptr<controller_manager_msgs::srv::ListControllers::Request>& request,
53+
const std::shared_ptr<controller_manager_msgs::srv::ListControllers::Response>& response) {
54+
handleListControllersService(request, response);
55+
});
5356
switch_controller_service_ = create_service<controller_manager_msgs::srv::SwitchController>(
5457
"controller_manager/switch_controller",
55-
std::bind(&MockControllersManagerService::handle_switch_controller_service, this, std::placeholders::_1,
56-
std::placeholders::_2));
58+
[this](const std::shared_ptr<controller_manager_msgs::srv::SwitchController::Request>& request,
59+
const std::shared_ptr<controller_manager_msgs::srv::SwitchController::Response>& response) {
60+
handleSwitchControllerService(request, response);
61+
});
5762
}
5863

5964
controller_manager_msgs::srv::SwitchController::Request last_request;
6065

6166
private:
62-
void handle_list_controllers_service(
63-
const std::shared_ptr<controller_manager_msgs::srv::ListControllers::Request> /*request*/,
64-
std::shared_ptr<controller_manager_msgs::srv::ListControllers::Response> response)
67+
void handleListControllersService(
68+
const std::shared_ptr<controller_manager_msgs::srv::ListControllers::Request>& /*request*/,
69+
const std::shared_ptr<controller_manager_msgs::srv::ListControllers::Response>& response)
6570
{
6671
controller_manager_msgs::msg::ChainConnection chain_connection_a;
6772
chain_connection_a.name = "B";
@@ -84,9 +89,9 @@ class MockControllersManagerService final : public rclcpp::Node
8489
response->controller = { controller_a, controller_b };
8590
}
8691

87-
void handle_switch_controller_service(
88-
const std::shared_ptr<controller_manager_msgs::srv::SwitchController::Request> request,
89-
std::shared_ptr<controller_manager_msgs::srv::SwitchController::Response> response)
92+
void handleSwitchControllerService(
93+
const std::shared_ptr<controller_manager_msgs::srv::SwitchController::Request>& request,
94+
const std::shared_ptr<controller_manager_msgs::srv::SwitchController::Response>& response)
9095
{
9196
last_request = *request;
9297
for (const auto& deactivate : request->deactivate_controllers)

0 commit comments

Comments
 (0)