Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CM: Add missing includes #1641

Merged
merged 2 commits into from
Jul 29, 2024
Merged

CM: Add missing includes #1641

merged 2 commits into from
Jul 29, 2024

Conversation

christophfroehlich
Copy link
Contributor

@christophfroehlich christophfroehlich commented Jul 29, 2024

Since #1627 (?) the build fails on debian11 (not part of the rolling-CI):

#23 268.5 /opt/ros2_ws/src/ros-controls/ros2_control/controller_manager/src/controller_manager.cpp: In member function ‘void controller_manager::ControllerManager::list_controllers_srv_cb(std::shared_ptr<controller_manager_msgs::srv::ListControllers_Request_<std::allocator<void> > >, std::shared_ptr<controller_manager_msgs::srv::ListControllers_Response_<std::allocator<void> > >)’:
#23 268.5 /opt/ros2_ws/src/ros-controls/ros2_control/controller_manager/src/controller_manager.cpp:1705:40: error: ‘set’ is not a member of ‘std’
#23 268.5  1705 |   std::unordered_map<std::string, std::set<std::string>> controller_chain_map;
#23 268.5       |                                        ^~~
#23 268.5 /opt/ros2_ws/src/ros-controls/ros2_control/controller_manager/src/controller_manager.cpp:24:1: note: ‘std::set’ is defined in header ‘<set>’; did you forget to ‘#include <set>’?
--- stderr: controller_manager                                        
/opt/ros2_ws/src/ros-controls/ros2_control/controller_manager/src/ros2_control_node.cpp: In function ‘int main(int, char**)’:
/opt/ros2_ws/src/ros-controls/ros2_control/controller_manager/src/ros2_control_node.cpp:39:30: error: ‘executors’ is not a member of ‘rclcpp’; did you mean ‘Executor’?
   39 |     std::make_shared<rclcpp::executors::MultiThreadedExecutor>();
      |                              ^~~~~~~~~
      |                              Executor

Copy link

codecov bot commented Jul 29, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 87.95%. Comparing base (872029c) to head (b1ac872).
Report is 1 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #1641   +/-   ##
=======================================
  Coverage   87.95%   87.95%           
=======================================
  Files         108      108           
  Lines        9913     9913           
  Branches      889      889           
=======================================
  Hits         8719     8719           
  Misses        875      875           
  Partials      319      319           
Flag Coverage Δ
unittests 87.95% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
controller_manager/src/controller_manager.cpp 77.21% <ø> (ø)
controller_manager/src/ros2_control_node.cpp 92.59% <ø> (ø)

Copy link
Member

@saikishor saikishor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing it

@christophfroehlich christophfroehlich changed the title CM: Add <set> include CM: Add missing includes Jul 29, 2024
Copy link
Member

@bmagyar bmagyar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@bmagyar bmagyar merged commit df43a1c into master Jul 29, 2024
18 of 19 checks passed
@bmagyar bmagyar deleted the add_set_include branch July 29, 2024 17:12
christophfroehlich added a commit that referenced this pull request Aug 12, 2024
* [ResourceManager] Make destructor virtual for use in derived classes (#1607)

* Fix typos in test_resource_manager.cpp (#1609)

* [CM] Remove support for the description parameter and use only `robot_description` topic (#1358)

---------

Co-authored-by: Felix Exner <exner@fzi.de>
Co-authored-by: Christoph Froehlich <christoph.froehlich@ait.ac.at>

* move critical variables to the private context (#1623)

* Fix controller starting with later load of robot description test (#1624)

* Fix the duplicated restart of the controller_manager services initialization

* Scope the ControllerManagerRunner to avoid malloc and other test issues

* reorder the tests for consistent log at the end

* Remove noqa (#1626)

* Unused header cleanup (#1627)

* Create debugging.rst (#1625)


---------

Co-authored-by: Sai Kishor Kothakota <saisastra3@gmail.com>
Co-authored-by: Christoph Froehlich <christoph.froehlich@ait.ac.at>

* Update changelogs

* 4.14.0

* add missing rclcpp logging include for Humble compatibility build (#1635)

* [CM] Remove deprecated spawner args (#1639)

* Add a pytest launch file to test ros2_control_node (#1636)

* Fix rst markup (#1642)

* Fix rqt_cm paragraph

* Fix indent

* CM: Add missing includes (#1641)

* [RM] Add `get_hardware_info` method to the Hardware Components (#1643)

* Fix the namespaced controller_manager spawner + added tests (#1640)

* Bump version of pre-commit hooks (#1649)

Co-authored-by: christophfroehlich <3367244+christophfroehlich@users.noreply.github.com>

* Add missing include for executors (#1653)

* Update changelogs

* 4.15.0

* refactor SwitchParams to fix the incosistencies in the spawner tests (#1638)

* Modify test with missing CM to have a timeout

* Catch exception when CM services are not found

And print the error and exit in the application

* Exit with code 1 on unreached CM

---------

Co-authored-by: Sai Kishor Kothakota <sai.kishor@pal-robotics.com>
Co-authored-by: Parker Drouillard <parker@pepcorp.ca>
Co-authored-by: Dr. Denis <denis@stoglrobotics.de>
Co-authored-by: Christoph Froehlich <christoph.froehlich@ait.ac.at>
Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
Co-authored-by: Henry Moore <henry.moore@picknik.ai>
Co-authored-by: Lennart Nachtigall <firesurfer127@gmail.com>
Co-authored-by: Sai Kishor Kothakota <saisastra3@gmail.com>
Co-authored-by: Bence Magyar <bence.magyar.robotics@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: christophfroehlich <3367244+christophfroehlich@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants