Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
bmagyar committed Oct 5, 2024
1 parent 730e91b commit f4ec3d6
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
2 changes: 0 additions & 2 deletions controller_interface/src/chainable_controller_interface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,6 @@ ChainableControllerInterface::export_reference_interfaces()
// check if the "reference_interfaces_" variable is resized to number of interfaces
if (reference_interfaces_.size() != reference_interfaces.size())
{
// TODO(destogl): Should here be "FATAL"? It is fatal in terms of controller but not for the
// framework
std::string error_msg =
"The internal storage for reference values 'reference_interfaces_' variable has size '" +
std::to_string(reference_interfaces_.size()) + "', but it is expected to have the size '" +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ class HARDWARE_INTERFACE_PUBLIC ResourceManager
* \param[in] interfaces list of controller's state interfaces as StateInterfaces.
*/
void import_controller_exported_state_interfaces(
const std::string & controller_name, std::vector<std::shared_ptr<StateInterface>> & interfaces);
const std::string & controller_name, std::vector<StateInterface::SharedPtr> & interfaces);

/// Get list of exported tate interface of a controller.
/**
Expand Down
2 changes: 1 addition & 1 deletion hardware_interface/src/resource_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1241,7 +1241,7 @@ bool ResourceManager::state_interface_is_available(const std::string & name) con

// CM API: Called in "callback/slow"-thread
void ResourceManager::import_controller_exported_state_interfaces(
const std::string & controller_name, std::vector<std::shared_ptr<StateInterface>> & interfaces)
const std::string & controller_name, std::vector<StateInterface::SharedPtr> & interfaces)
{
std::lock_guard<std::recursive_mutex> guard(resource_interfaces_lock_);
auto interface_names = resource_storage_->add_state_interfaces(interfaces);
Expand Down

0 comments on commit f4ec3d6

Please sign in to comment.