Skip to content

Commit 1be58c0

Browse files
authored
Call vector.erase with end iterator overload (#1314)
Signed-off-by: Stephen Brawner <[email protected]>
1 parent 29c48a4 commit 1be58c0

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

rclcpp/include/rclcpp/wait_set_policies/dynamic_storage.hpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -382,11 +382,13 @@ class DynamicStorage : public rclcpp::wait_set_policies::detail::StoragePolicyCo
382382
return weak_ptr.expired();
383383
};
384384
// remove guard conditions which have been deleted
385-
guard_conditions_.erase(std::remove_if(guard_conditions_.begin(), guard_conditions_.end(), p));
386-
timers_.erase(std::remove_if(timers_.begin(), timers_.end(), p));
387-
clients_.erase(std::remove_if(clients_.begin(), clients_.end(), p));
388-
services_.erase(std::remove_if(services_.begin(), services_.end(), p));
389-
waitables_.erase(std::remove_if(waitables_.begin(), waitables_.end(), p));
385+
guard_conditions_.erase(
386+
std::remove_if(guard_conditions_.begin(), guard_conditions_.end(), p),
387+
guard_conditions_.end());
388+
timers_.erase(std::remove_if(timers_.begin(), timers_.end(), p), timers_.end());
389+
clients_.erase(std::remove_if(clients_.begin(), clients_.end(), p), clients_.end());
390+
services_.erase(std::remove_if(services_.begin(), services_.end(), p), services_.end());
391+
waitables_.erase(std::remove_if(waitables_.begin(), waitables_.end(), p), waitables_.end());
390392
}
391393

392394
void

0 commit comments

Comments
 (0)