Skip to content

[jazzy] Use rclcpp type support helpers in rosbag2_cpp (backport #2017)#2130

Merged
MichaelOrlov merged 2 commits intojazzyfrom
mergify/bp/jazzy/pr-2017
Aug 14, 2025
Merged

[jazzy] Use rclcpp type support helpers in rosbag2_cpp (backport #2017)#2130
MichaelOrlov merged 2 commits intojazzyfrom
mergify/bp/jazzy/pr-2017

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify bot commented Aug 7, 2025

Description

Historically, the type support helpers were implemented in the rosbag2_cpp/typesupport_helpers.cpp, then the implementation of the major helper functions was added to the core rclcpp package in the rclcpp/typesupport_helpers.hpp.
However, the original implementation was never removed from the rosbag2_cpp package.

This PR replaces original type support helpers in the rosbag2_cpp with the same functions from the core rclcpp package to avoid code duplication and divergences in the future.

Additional information

action-ros-ci-repos-supplemental: https://raw.githubusercontent.com/ros2/ros2/rolling/ros2.repos

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

@MichaelOrlov @mergify
Use rclcpp typesupport helpers in rosbag2_cpp (#2017)
9e88cbf 
Signed-off-by: Michael Orlov <morlovmr@gmail.com>
(cherry picked from commit bc37cdf)

# Conflicts:
#	rosbag2_transport/src/rosbag2_transport/topic_filter.cpp
@mergify
Copy link
Copy Markdown
Author

mergify bot commented Aug 7, 2025

Cherry-pick of bc37cdf has failed:

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

You are currently cherry-picking commit bc37cdf.
  (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:   rosbag2_cpp/CMakeLists.txt
	deleted:    rosbag2_cpp/include/rosbag2_cpp/typesupport_helpers.hpp
	modified:   rosbag2_cpp/src/rosbag2_cpp/converter.cpp
	deleted:    rosbag2_cpp/src/rosbag2_cpp/typesupport_helpers.cpp
	deleted:    rosbag2_cpp/test/rosbag2_cpp/test_typesupport_helpers.cpp
	modified:   rosbag2_cpp/test/rosbag2_cpp/types/test_ros2_message.cpp
	modified:   rosbag2_tests/test/rosbag2_tests/test_converter.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rosbag2_transport/src/rosbag2_transport/topic_filter.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

@mergify mergify bot added the conflicts label Aug 7, 2025
@mergify mergify bot mentioned this pull request Aug 7, 2025
Merged
@MichaelOrlov MichaelOrlov changed the title Use rclcpp type support helpers in rosbag2_cpp (backport #2017) [jazzy] Use rclcpp type support helpers in rosbag2_cpp (backport #2017) Aug 7, 2025
@morlov-apexai
Address merge conflicts
addffd5 
Signed-off-by: Michael Orlov <michael.orlov@apex.ai>
@MichaelOrlov
Copy link
Copy Markdown
Contributor

MichaelOrlov commented Aug 14, 2025

Pulls: #2130
Gist: https://gist.githubusercontent.com/MichaelOrlov/e627bce07226f4da034524ac1ad21801/raw/43eb5c7a9552ac54a8ae231a5e398a3b6765a8bb/ros2.repos
BUILD args: --packages-above-and-dependencies rosbag2_cpp rosbag2_transport rosbag2_tests
TEST args: --packages-above rosbag2_cpp rosbag2_transport rosbag2_tests
ROS Distro: jazzy
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/16705

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

@MichaelOrlov MichaelOrlov merged commit c90b88d into jazzy Aug 14, 2025
12 checks passed
@MichaelOrlov MichaelOrlov deleted the mergify/bp/jazzy/pr-2017 branch August 14, 2025 17:38
@MichaelOrlov
Copy link
Copy Markdown
Contributor

MichaelOrlov commented Aug 18, 2025

Pulls: #2130
Gist: https://gist.githubusercontent.com/MichaelOrlov/01597ee89fb856a2082094b2495d540a/raw/43eb5c7a9552ac54a8ae231a5e398a3b6765a8bb/ros2.repos
BUILD args: --packages-above-and-dependencies rosbag2_cpp
TEST args: --packages-above rosbag2_cpp
ROS Distro: jazzy
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/16718

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

@marcoag marcoag mentioned this pull request Jan 25, 2026
Merged
This was referenced Jan 25, 2026
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MichaelOrlov MichaelOrlov MichaelOrlov approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@MichaelOrlov @morlov-apexai