From e6ad86b0beeaa0c4e4ceebc94e4d6e87f136f503 Mon Sep 17 00:00:00 2001 From: mauropasse Date: Sun, 5 Mar 2023 17:53:14 +0000 Subject: [PATCH] Fix clang warning: bugprone-use-after-move (#2116) Signed-off-by: Mauro Passerino Co-authored-by: Mauro Passerino --- .../include/rclcpp/experimental/intra_process_manager.hpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rclcpp/include/rclcpp/experimental/intra_process_manager.hpp b/rclcpp/include/rclcpp/experimental/intra_process_manager.hpp index 9d5cc3ecef..f49a34e45c 100644 --- a/rclcpp/include/rclcpp/experimental/intra_process_manager.hpp +++ b/rclcpp/include/rclcpp/experimental/intra_process_manager.hpp @@ -926,7 +926,11 @@ class IntraProcessManager if (std::next(it) == subscription_ids.end()) { // If this is the last subscription, give up ownership subscription->provide_intra_process_data(std::move(message)); +<<<<<<< HEAD // Nothing else to do +======= + // Last message delivered, break from for loop +>>>>>>> 1a9b117d (Fix clang warning: bugprone-use-after-move (#2116)) break; } else { // Copy the message since we have additional subscriptions to serve @@ -967,7 +971,7 @@ class IntraProcessManager if (std::next(it) == subscription_ids.end()) { // If this is the last subscription, give up ownership ros_message_subscription->provide_intra_process_message(std::move(message)); - // Nothing else to do + // Last message delivered, break from for loop break; } else { // Copy the message since we have additional subscriptions to serve