diff --git a/controller_manager/include/controller_manager/controller_manager.hpp b/controller_manager/include/controller_manager/controller_manager.hpp index 6cb8a567ae..6144a81701 100644 --- a/controller_manager/include/controller_manager/controller_manager.hpp +++ b/controller_manager/include/controller_manager/controller_manager.hpp @@ -421,13 +421,13 @@ class ControllerManager : public rclcpp::Node * \returns return_type::OK if all preceding controllers pass the checks, otherwise * return_type::ERROR. */ - controller_interface::return_type check_preceeding_controllers_for_deactivate( + controller_interface::return_type check_preceding_controllers_for_deactivate( const std::vector & controllers, int strictness, const ControllersListIterator controller_it); /** * Check if all deactivate requests are valid. - * Perform a detailed check internally by calling check_preceeding_controllers_for_deactivate. + * Perform a detailed check internally by calling check_preceding_controllers_for_deactivate. * * \param[in] controllers list with controllers. * \param[in] strictness if value is equal "MANIPULATE_CONTROLLERS_CHAIN" then all following diff --git a/controller_manager/src/controller_manager.cpp b/controller_manager/src/controller_manager.cpp index 35e9bb6140..1fc883430b 100644 --- a/controller_manager/src/controller_manager.cpp +++ b/controller_manager/src/controller_manager.cpp @@ -2458,7 +2458,7 @@ controller_interface::return_type ControllerManager::check_following_controllers } } return controller_interface::return_type::OK; -}; +} ControllerManager::CheckDeActivateRequestResult ControllerManager::check_activate_requests( const std::vector & controllers, int strictness) @@ -2522,7 +2522,7 @@ ControllerManager::CheckDeActivateRequestResult ControllerManager::check_activat return CheckDeActivateRequestResult::OK; } -controller_interface::return_type ControllerManager::check_preceeding_controllers_for_deactivate( +controller_interface::return_type ControllerManager::check_preceding_controllers_for_deactivate( const std::vector & controllers, int /*strictness*/, const ControllersListIterator controller_it) { @@ -2648,7 +2648,7 @@ ControllerManager::CheckDeActivateRequestResult ControllerManager::check_deactiv } else { - status = check_preceeding_controllers_for_deactivate(controllers, strictness, controller_it); + status = check_preceding_controllers_for_deactivate(controllers, strictness, controller_it); } if (status != controller_interface::return_type::OK)