Skip to content

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

Closed
mergify[bot] wants to merge 1 commit intogalacticfrom
mergify/bp/galactic/pr-1657
Closed

Do not attempt to use void allocators for memory allocation. (backport #1657)#2003
mergify[bot] wants to merge 1 commit intogalacticfrom
mergify/bp/galactic/pr-1657

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@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/galactic/pr-1657
Your branch is up to date with 'origin/galactic'.

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
@sykwer
Copy link
Copy Markdown

sykwer commented Aug 27, 2022

After this PR merged, Close #2001.

@clalancette
Copy link
Copy Markdown
Contributor

Closing this one as Galactic is now EOL.

@clalancette clalancette deleted the mergify/bp/galactic/pr-1657 branch January 18, 2023 15:58
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.

3 participants