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

Switch to std::map for TopicTypeMap (backport #546) #566

Merged
merged 2 commits into from
Mar 20, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 20, 2025

I open this PR just for visibility, it's related with this PR #536 and in particular with this comment #536 (comment)


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

Signed-off-by: Alejandro Hernandez Cordero <[email protected]>
Co-authored-by: Yuyuan Yuan <[email protected]>
(cherry picked from commit db25318)

# Conflicts:
#	rmw_zenoh_cpp/CMakeLists.txt
@mergify mergify bot added the conflicts label Mar 20, 2025
Copy link
Author

mergify bot commented Mar 20, 2025

Cherry-pick of db25318 has failed:

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

You are currently cherry-picking commit db25318.
  (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:   .github/workflows/style.yaml
	modified:   rmw_zenoh_cpp/package.xml
	modified:   rmw_zenoh_cpp/src/detail/graph_cache.cpp
	modified:   rmw_zenoh_cpp/src/detail/graph_cache.hpp
	deleted:    rmw_zenoh_cpp/src/detail/ordered_hash.hpp
	deleted:    rmw_zenoh_cpp/src/detail/ordered_map.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rmw_zenoh_cpp/CMakeLists.txt

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

fix merge

Verified

This commit was signed with the committer’s verified signature.
ahcorde Alejandro Hernández Cordero
Signed-off-by: Alejandro Hernandez Cordero <[email protected]>
@ahcorde ahcorde merged commit 91612f8 into humble Mar 20, 2025
4 checks passed
@ahcorde ahcorde deleted the mergify/bp/humble/pr-546 branch March 20, 2025 17:01
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.

None yet

1 participant