From 45a47c6448cdfc36c51004cb95891a021107a1ca Mon Sep 17 00:00:00 2001 From: brawner Date: Mon, 5 Oct 2020 13:39:42 -0700 Subject: [PATCH] Call vector.erase with end iterator overload (#1314) (#1380) Signed-off-by: Stephen Brawner --- .../rclcpp/wait_set_policies/dynamic_storage.hpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/rclcpp/include/rclcpp/wait_set_policies/dynamic_storage.hpp b/rclcpp/include/rclcpp/wait_set_policies/dynamic_storage.hpp index f930ab4..4cec85f 100644 --- a/rclcpp/include/rclcpp/wait_set_policies/dynamic_storage.hpp +++ b/rclcpp/include/rclcpp/wait_set_policies/dynamic_storage.hpp @@ -382,11 +382,13 @@ public: return weak_ptr.expired(); }; // remove guard conditions which have been deleted - guard_conditions_.erase(std::remove_if(guard_conditions_.begin(), guard_conditions_.end(), p)); - timers_.erase(std::remove_if(timers_.begin(), timers_.end(), p)); - clients_.erase(std::remove_if(clients_.begin(), clients_.end(), p)); - services_.erase(std::remove_if(services_.begin(), services_.end(), p)); - waitables_.erase(std::remove_if(waitables_.begin(), waitables_.end(), p)); + guard_conditions_.erase( + std::remove_if(guard_conditions_.begin(), guard_conditions_.end(), p), + guard_conditions_.end()); + timers_.erase(std::remove_if(timers_.begin(), timers_.end(), p), timers_.end()); + clients_.erase(std::remove_if(clients_.begin(), clients_.end(), p), clients_.end()); + services_.erase(std::remove_if(services_.begin(), services_.end(), p), services_.end()); + waitables_.erase(std::remove_if(waitables_.begin(), waitables_.end(), p), waitables_.end()); } void