Skip to content

Commit 631e7ba

Browse files
authored
Use "&&" instead of "and" (#3510)
1 parent 6cb8644 commit 631e7ba

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

moveit_plugins/moveit_simple_controller_manager/include/moveit_simple_controller_manager/action_based_controller_handle.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class ActionBasedControllerHandle : public ActionBasedControllerHandleBase
145145
do
146146
{
147147
status = result_future.wait_for(50ms);
148-
if ((status == std::future_status::timeout) and ((node_->now() - start) > timeout))
148+
if ((status == std::future_status::timeout) && ((node_->now() - start) > timeout))
149149
{
150150
RCLCPP_WARN(logger_, "waitForExecution timed out");
151151
return false;

0 commit comments

Comments
 (0)