Skip to content

Add patch to fix typesupport bug in rmw_cyclonedds. #2

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jun 9, 2021
Merged

Add patch to fix typesupport bug in rmw_cyclonedds. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4c3192
add patch to fix typsupport bug in rmw_cyclonedds.
EvanLiUAV Jun 8, 2021
cff3c3e
fix some comments.
EvanLiUAV Jun 9, 2021
fc48973
add BUILD.bazel.
EvanLiUAV Jun 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added repositories/patches/BUILD.bazel
View file
Open in desktop
Empty file.
27 changes: 27 additions & 0 deletions repositories/patches/rmw_cyclonedds-fix-typesupport-conditions-bug.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
diff --git a/rmw_cyclonedds_cpp/src/serdata.cpp b/rmw_cyclonedds_cpp/src/serdata.cpp
index 05b3286..b3382cc 100644
--- a/rmw_cyclonedds_cpp/src/serdata.cpp
+++ b/rmw_cyclonedds_cpp/src/serdata.cpp
@@ -60,14 +60,16 @@ using ResponseTypeSupport_cpp = rmw_cyclonedds_cpp::ResponseTypeSupport<
rosidl_typesupport_introspection_cpp::ServiceMembers,
rosidl_typesupport_introspection_cpp::MessageMembers>;

-static bool using_introspection_c_typesupport(const char * typesupport_identifier)
-{
- return typesupport_identifier == rosidl_typesupport_introspection_c__identifier;
+static bool using_introspection_c_typesupport(
+ const char* typesupport_identifier) {
+ return !std::string(typesupport_identifier)
+ .compare(rosidl_typesupport_introspection_c__identifier);
}

-static bool using_introspection_cpp_typesupport(const char * typesupport_identifier)
-{
- return typesupport_identifier == rosidl_typesupport_introspection_cpp::typesupport_identifier;
+static bool using_introspection_cpp_typesupport(
+ const char* typesupport_identifier) {
+ return !std::string(typesupport_identifier)
+ .compare(rosidl_typesupport_introspection_cpp::typesupport_identifier);
}

void * create_message_type_support(
3 changes: 3 additions & 0 deletions repositories/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,5 +220,8 @@ def ros2_repositories():
build_file = "@com_github_mvukov_rules_ros2//repositories:rmw_cyclonedds.BUILD.bazel",
sha256 = "5995d8ae3613126ee5b68db68d0c1c4a6caa8eec3fb0a269921a16fa1a810af6",
strip_prefix = "rmw_cyclonedds-0.7.6",
patch_args = ["-p1"],
patches=["@com_github_mvukov_rules_ros2//repositories/patches:rmw_cyclonedds-fix-typesupport-conditions-bug.patch"],
urls = ["https://github.com/ros2/rmw_cyclonedds/archive/0.7.6.tar.gz"],
)