niklas/rclcpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Call vector.erase with end iterator overload (#1314) (#1380)

Browse source 
Signed-off-by: Stephen Brawner <brawner@gmail.com>
This commit is contained in:
brawner 2020-10-05 13:39:42 -07:00 • committed by GitHub
parent 6e408b79f3
commit 45a47c6448
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rclcpp/include/rclcpp/wait_set_policies/dynamic_storage.hpp
View file

@ -382,11 +382,13 @@ public:
return weak_ptr.expired(); return weak_ptr.expired();
}; };
// remove guard conditions which have been deleted // remove guard conditions which have been deleted
guard_conditions_.erase(std::remove_if(guard_conditions_.begin(), guard_conditions_.end(), p)); guard_conditions_.erase(
timers_.erase(std::remove_if(timers_.begin(), timers_.end(), p)); std::remove_if(guard_conditions_.begin(), guard_conditions_.end(), p),
clients_.erase(std::remove_if(clients_.begin(), clients_.end(), p)); guard_conditions_.end());
services_.erase(std::remove_if(services_.begin(), services_.end(), p)); timers_.erase(std::remove_if(timers_.begin(), timers_.end(), p), timers_.end());
waitables_.erase(std::remove_if(waitables_.begin(), waitables_.end(), p)); 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 void