From 3f5425652c170eec40f5458e5b9d5b13af6b7679 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Wed, 3 Jul 2024 17:04:55 +1000 Subject: [PATCH] Become standard-compatible (#2895) Replace and -> && --- .../action_based_controller_handle.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moveit_plugins/moveit_simple_controller_manager/include/moveit_simple_controller_manager/action_based_controller_handle.h b/moveit_plugins/moveit_simple_controller_manager/include/moveit_simple_controller_manager/action_based_controller_handle.h index 311d51f7a5..e6e21efe97 100644 --- a/moveit_plugins/moveit_simple_controller_manager/include/moveit_simple_controller_manager/action_based_controller_handle.h +++ b/moveit_plugins/moveit_simple_controller_manager/include/moveit_simple_controller_manager/action_based_controller_handle.h @@ -145,7 +145,7 @@ class ActionBasedControllerHandle : public ActionBasedControllerHandleBase do { status = result_future.wait_for(50ms); - if ((status == std::future_status::timeout) and ((node_->now() - start) > timeout)) + if ((status == std::future_status::timeout) && ((node_->now() - start) > timeout)) { RCLCPP_WARN(LOGGER, "waitForExecution timed out"); return false;