Skip to content

Consistently add <cmath> include with define for windows (backport #2193)#2196

Merged
christophfroehlich merged 2 commits intokiltedfrom
mergify/bp/kilted/pr-2193
Mar 4, 2026
Merged

Consistently add <cmath> include with define for windows (backport #2193)#2196
christophfroehlich merged 2 commits intokiltedfrom
mergify/bp/kilted/pr-2193

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Mar 3, 2026

ros-controls/ros2_control#3061

and needed for #2192


This is an automatic backport of pull request #2193 done by Mergify.

(cherry picked from commit 8b90d97)

# Conflicts:
#	admittance_controller/test/test_admittance_rule_impl.cpp
@mergify mergify bot added the conflicts label Mar 3, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Mar 3, 2026

Cherry-pick of 8b90d97 has failed:

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

You are currently cherry-picking commit 8b90d97.
  (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)

Changes to be committed:
	modified:   imu_sensor_broadcaster/test/test_imu_sensor_broadcaster.cpp
	modified:   imu_sensor_broadcaster/test/test_imu_transform.cpp
	modified:   joint_trajectory_controller/src/trajectory.cpp
	modified:   joint_trajectory_controller/test/test_trajectory.cpp
	modified:   joint_trajectory_controller/test/test_trajectory_controller.cpp
	modified:   mecanum_drive_controller/test/test_mecanum_drive_controller.cpp
	modified:   steering_controllers_library/test/test_steering_odometry.cpp
	modified:   tricycle_controller/src/tricycle_controller.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   admittance_controller/test/test_admittance_rule_impl.cpp

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

@codecov
Copy link
Copy Markdown

codecov bot commented Mar 4, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 85.16%. Comparing base (caaca43) to head (53b0622).
⚠️ Report is 1 commits behind head on kilted.

Additional details and impacted files
@@           Coverage Diff           @@
##           kilted    #2196   +/-   ##
=======================================
  Coverage   85.16%   85.16%           
=======================================
  Files         151      151           
  Lines       14574    14574           
  Branches     1259     1259           
=======================================
  Hits        12412    12412           
  Misses       1716     1716           
  Partials      446      446           
Flag Coverage Δ
unittests 85.16% <ø> (ø)

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

Files with missing lines Coverage Δ
...r_broadcaster/test/test_imu_sensor_broadcaster.cpp 97.16% <ø> (ø)
imu_sensor_broadcaster/test/test_imu_transform.cpp 100.00% <ø> (ø)
joint_trajectory_controller/src/trajectory.cpp 89.90% <ø> (ø)
...int_trajectory_controller/test/test_trajectory.cpp 100.00% <ø> (ø)
...ory_controller/test/test_trajectory_controller.cpp 99.80% <ø> (ø)
..._controller/test/test_mecanum_drive_controller.cpp 100.00% <ø> (ø)
...ontrollers_library/test/test_steering_odometry.cpp 100.00% <ø> (ø)
tricycle_controller/src/tricycle_controller.cpp 64.31% <ø> (ø)
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@christophfroehlich christophfroehlich merged commit 8ebf1c0 into kilted Mar 4, 2026
12 of 13 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/kilted/pr-2193 branch March 4, 2026 07:33
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.

1 participant