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

Do not attempt to use void allocators for memory allocation. (backport #1657) #2004

Merged
merged 2 commits into from
May 16, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 24, 2022

This is an automatic backport of pull request #1657 done by Mergify.
Cherry-pick of 0659d82 has failed:

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

You are currently cherry-picking commit 0659d829.
  (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:   rclcpp/test/rclcpp/test_intra_process_manager_with_allocators.cpp

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

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Keep a rebound allocator for byte-sized memory blocks around
for publisher and subscription options.

Follow-up after 1fc2d58

Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com>
(cherry picked from commit 0659d82)

# Conflicts:
#	rclcpp/include/rclcpp/publisher_options.hpp
#	rclcpp/include/rclcpp/subscription_options.hpp
Signed-off-by: Dharini Dutia <dharini@openrobotics.org>
@quarkytale
Copy link

quarkytale commented May 11, 2023

CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

@fujitatomoya
Copy link
Collaborator

  • Windows Build Status

@quarkytale
Copy link

Windows on its main branch:
Build Status

@quarkytale quarkytale moved this from Proposed to In progress in Foxy Patch Release 11 May 15, 2023
@fujitatomoya
Copy link
Collaborator

CI window failures are unrelated to this PR. @quarkytale

@quarkytale quarkytale merged commit 9c82f6c into foxy May 16, 2023
2 checks passed
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/foxy/pr-1657 branch May 16, 2023 16:54
@quarkytale quarkytale moved this from In progress to Needs release in Foxy Patch Release 11 May 17, 2023
@quarkytale quarkytale moved this from Needs release to Done in Foxy Patch Release 11 May 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants