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.

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

Remove rmw_connext_cpp references. #1595

Merged
merged 3 commits into from
Mar 25, 2021
Merged

Remove rmw_connext_cpp references. #1595

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
545961f
Remove rmw_connext_cpp references.
clalancette Mar 24, 2021
372029a
Style fixup.
clalancette Mar 24, 2021
51eb504
Update rclcpp/test/rclcpp/executors/test_static_executor_entities_col…
clalancette Mar 24, 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
2 changes: 1 addition & 1 deletion rclcpp/test/rclcpp/executors/test_static_executor_entities_collector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ TEST_F(TestStaticExecutorEntitiesCollector, add_remove_node_with_entities) {
auto client = node->create_client<test_msgs::srv::Empty>("service");
auto waitable = std::make_shared<TestWaitable>();

// Adding a subscription with rmw_connext_cpp adds another waitable, so we need to get the
// Adding a subscription could add another waitable, so we need to get the
// current number of waitables just before adding the new waitable.
expected_number_of_entities->waitables = get_number_of_default_entities(node)->waitables;
node->get_node_waitables_interface()->add_waitable(waitable, nullptr);
Expand Down
5 changes: 1 addition & 4 deletions rclcpp/test/rclcpp/strategies/test_allocator_memory_strategy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,10 +511,7 @@ TEST_F(TestAllocatorMemoryStrategy, number_of_entities_with_subscription) {
RclWaitSetSizes expected_sizes = {};
expected_sizes.size_of_subscriptions = 1;
const std::string implementation_identifier = rmw_get_implementation_identifier();
// TODO(asorbini): Remove Connext exception once ros2/rmw_connext is deprecated.
if (implementation_identifier == "rmw_connext_cpp" ||
implementation_identifier == "rmw_cyclonedds_cpp")
{
if (implementation_identifier == "rmw_cyclonedds_cpp") {
// For cyclonedds, a subscription will also add an event and waitable
expected_sizes.size_of_events += 1;
expected_sizes.size_of_waitables += 1;
Expand Down