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

Add -Wconversion flag to protect future developments (backport #667) #1322

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 26, 2024

Same reasons as ros-controls/ros2_control#1053

explicitly catching errors of time being zero in forward_command_controller see
I think there might be an ABI breaking in JTC with one argument changed from int to size_t. I did not know what to do there, and went for ABI breaking but I could also make it a static_cast if preferred. see


This is an automatic backport of pull request #667 done by [Mergify](https://mergify.com).

(cherry picked from commit 23f0def)

# Conflicts:
#	diff_drive_controller/src/diff_drive_controller.cpp
#	joint_trajectory_controller/src/joint_trajectory_controller.cpp
#	tricycle_controller/src/tricycle_controller.cpp
Copy link
Contributor Author

mergify bot commented Oct 26, 2024

Cherry-pick of 23f0def has failed:

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

You are currently cherry-picking commit 23f0def.
  (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:   diff_drive_controller/src/diff_drive_controller.cpp
	both modified:   joint_trajectory_controller/src/joint_trajectory_controller.cpp
	both modified:   tricycle_controller/src/tricycle_controller.cpp

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

@christophfroehlich
Copy link
Contributor

Oops, this was already included in iron.

@christophfroehlich christophfroehlich deleted the mergify/bp/iron/pr-667 branch October 26, 2024 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants