Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 5, 2025

On jazzy and before the cleanup #494, we had an ambiguous overload. I suggest changing the same on kilted+rolling to have the same API everywhere.

docstring was wrong anyways 🙈

/workspaces/ros2_jazzy_ws/src/control_toolbox/control_toolbox/test/pid_ros_parameters_tests.cpp: In instantiation of ‘TestablePidROS::TestablePidROS(std::shared_ptr<_Tp>, std::string) [with NodeT = rclcpp::Node; std::string = std::__cxx11::basic_string<char>]’:
/workspaces/ros2_jazzy_ws/src/control_toolbox/control_toolbox/test/pid_ros_parameters_tests.cpp:136:30:   required from here
/workspaces/ros2_jazzy_ws/src/control_toolbox/control_toolbox/test/pid_ros_parameters_tests.cpp:50:51: error: call of overloaded ‘PidROS(std::shared_ptr<rclcpp::Node>&, std::string&)’ is ambiguous
   50 |   : control_toolbox::PidROS(node_ptr, param_prefix)
      |                                                   ^
In file included from /workspaces/ros2_jazzy_ws/src/control_toolbox/control_toolbox/test/pid_ros_parameters_tests.cpp:16:
/workspaces/ros2_jazzy_ws/src/control_toolbox/control_toolbox/include/control_toolbox/pid_ros.hpp:96:12: note: candidate: ‘control_toolbox::PidROS::PidROS(std::shared_ptr<_Tp>, const std::string&, const std::string&) [with NodeT = rclcpp::Node; std::string = std::__cxx11::basic_string<char>]’
   96 |   explicit PidROS(
      |            ^~~~~~
/workspaces/ros2_jazzy_ws/src/control_toolbox/control_toolbox/include/control_toolbox/pid_ros.hpp:71:89: note: candidate: ‘control_toolbox::PidROS::PidROS(std::shared_ptr<_Tp>, std::string, bool) [with NodeT = rclcpp::Node; std::string = std::__cxx11::basic_string<char>]’
   71 |   [[deprecated("Use overloads with explicit prefixes for params and topics")]] explicit PidROS(
      |                                                                                         ^~~~~~
```<hr>This is an automatic backport of pull request #499 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Oct 5, 2025
Copy link
Author

mergify bot commented Oct 5, 2025

Cherry-pick of d84f3fa has failed:

On branch mergify/bp/jazzy/pr-499
Your branch is up to date with 'origin/jazzy'.

You are currently cherry-picking commit d84f3fa.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   control_toolbox/include/control_toolbox/pid_ros.hpp

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@saikishor saikishor force-pushed the mergify/bp/jazzy/pr-499 branch from b323354 to 606a6f3 Compare October 5, 2025 06:56
(cherry picked from commit d84f3fa)

# Conflicts:
#	control_toolbox/include/control_toolbox/pid_ros.hpp
@saikishor saikishor force-pushed the mergify/bp/jazzy/pr-499 branch from 606a6f3 to 4d19b13 Compare October 5, 2025 07:02
@codecov-commenter
Copy link

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 78.35%. Comparing base (7b819ce) to head (4d19b13).

Additional details and impacted files
@@           Coverage Diff           @@
##            jazzy     #500   +/-   ##
=======================================
  Coverage   78.35%   78.35%           
=======================================
  Files          28       28           
  Lines        2194     2194           
  Branches      130      130           
=======================================
  Hits         1719     1719           
  Misses        402      402           
  Partials       73       73           
Flag Coverage Δ
unittests 78.35% <ø> (ø)

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

Files with missing lines Coverage Δ
...ontrol_toolbox/include/control_toolbox/pid_ros.hpp 100.00% <ø> (ø)
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@christophfroehlich christophfroehlich merged commit 4674e45 into jazzy Oct 5, 2025
12 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/jazzy/pr-499 branch October 5, 2025 08:26
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