Skip to content

Commit

Permalink
Satisfy clang
Browse files Browse the repository at this point in the history
  • Loading branch information
christophfroehlich committed Mar 12, 2024
1 parent 2b7885d commit 6dfc1bc
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 18 deletions.
12 changes: 4 additions & 8 deletions controller_manager/test/test_controller_manager_srvs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -780,8 +780,7 @@ TEST_F(TestControllerManagerSrvs, list_sorted_complex_chained_controllers)
auto get_ctrl_pos = [result](const std::string & controller_name) -> int64_t
{
auto it = std::find_if(
result->controller.begin(), result->controller.end(),
[controller_name](auto itf)
result->controller.begin(), result->controller.end(), [controller_name](auto itf)
{ return (itf.name.find(controller_name) != std::string::npos); });
return std::distance(result->controller.begin(), it);
};
Expand Down Expand Up @@ -992,8 +991,7 @@ TEST_F(TestControllerManagerSrvs, list_sorted_independent_chained_controllers)
auto get_ctrl_pos = [result](const std::string & controller_name) -> int64_t
{
auto it = std::find_if(
result->controller.begin(), result->controller.end(),
[controller_name](auto itf)
result->controller.begin(), result->controller.end(), [controller_name](auto itf)
{ return (itf.name.find(controller_name) != std::string::npos); });
return std::distance(result->controller.begin(), it);
};
Expand Down Expand Up @@ -1269,8 +1267,7 @@ TEST_F(TestControllerManagerSrvs, list_large_number_of_controllers_with_chains)
auto get_ctrl_pos = [result](const std::string & controller_name) -> int64_t
{
auto it = std::find_if(
result->controller.begin(), result->controller.end(),
[controller_name](auto itf)
result->controller.begin(), result->controller.end(), [controller_name](auto itf)
{ return (itf.name.find(controller_name) != std::string::npos); });
return std::distance(result->controller.begin(), it);
};
Expand Down Expand Up @@ -1494,8 +1491,7 @@ TEST_F(TestControllerManagerSrvs, list_sorted_large_chained_controller_tree)
auto get_ctrl_pos = [result](const std::string & controller_name) -> int64_t
{
auto it = std::find_if(
result->controller.begin(), result->controller.end(),
[controller_name](auto itf)
result->controller.begin(), result->controller.end(), [controller_name](auto itf)
{ return (itf.name.find(controller_name) != std::string::npos); });
return std::distance(result->controller.begin(), it);
};
Expand Down
3 changes: 1 addition & 2 deletions controller_manager/test/test_spawner_unspawner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,7 @@ TEST_F(TestLoadController, unload_on_kill)
// Launch spawner with unload on kill
// timeout command will kill it after the specified time with signal SIGINT
std::stringstream ss;
ss << "timeout --signal=INT 5 "
<< "ros2 run controller_manager spawner "
ss << "timeout --signal=INT 5 " << "ros2 run controller_manager spawner "
<< "ctrl_3 -c test_controller_manager -t "
<< std::string(test_controller::TEST_CONTROLLER_CLASS_NAME) << " --unload-on-kill";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ class TestForceTorqueSensor : public SensorInterface
{
if (
std::find_if(
state_interfaces.begin(), state_interfaces.end(),
[&ft_key](const auto & interface_info)
state_interfaces.begin(), state_interfaces.end(), [&ft_key](const auto & interface_info)
{ return interface_info.name == ft_key; }) == state_interfaces.end())
{
return CallbackReturn::ERROR;
Expand Down
9 changes: 3 additions & 6 deletions joint_limits/include/joint_limits/joint_limits.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,11 @@ struct SoftJointLimits
{
std::stringstream ss_output;

ss_output << " soft position limits: "
<< "[" << min_position << ", " << max_position << "]\n";
ss_output << " soft position limits: " << "[" << min_position << ", " << max_position << "]\n";

ss_output << " k-position: "
<< "[" << k_position << "]\n";
ss_output << " k-position: " << "[" << k_position << "]\n";

ss_output << " k-velocity: "
<< "[" << k_velocity << "]\n";
ss_output << " k-velocity: " << "[" << k_velocity << "]\n";

return ss_output.str();
}
Expand Down

0 comments on commit 6dfc1bc

Please sign in to comment.