summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJackLivio <jack@livio.io>2020-04-03 11:58:22 -0400
committerJackLivio <jack@livio.io>2020-04-03 11:58:22 -0400
commite82a28afdeb390a88a8d2fee5f748402b93d5a86 (patch)
tree0ae11fad1e3caaba5820b41d2ac2e0a8344f0fe2
parentddcd97db9cdc5455550ebc20bc64b068c610b32b (diff)
downloadsdl_core-fix/clear_timer_pool.tar.gz
Fix remove_if in ClearTimerPoolfix/clear_timer_pool
-rw-r--r--src/components/application_manager/src/application_manager_impl.cc17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index f807be2f5e..60ec1cf4c4 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -3815,16 +3815,21 @@ void ApplicationManagerImpl::ClearTimerPool() {
LOG4CXX_AUTO_TRACE(logger_);
{
sync_primitives::AutoLock lock(close_app_timer_pool_lock_);
- std::remove_if(close_app_timer_pool_.begin(),
- close_app_timer_pool_.end(),
- [](TimerSPtr timer) { return !timer->is_running(); });
+
+ close_app_timer_pool_.erase(
+ std::remove_if(close_app_timer_pool_.begin(),
+ close_app_timer_pool_.end(),
+ [](TimerSPtr timer) { return !timer->is_running(); }),
+ close_app_timer_pool_.end());
}
{
sync_primitives::AutoLock lock(end_stream_timer_pool_lock_);
- std::remove_if(end_stream_timer_pool_.begin(),
- end_stream_timer_pool_.end(),
- [](TimerSPtr timer) { return !timer->is_running(); });
+ end_stream_timer_pool_.erase(
+ std::remove_if(end_stream_timer_pool_.begin(),
+ end_stream_timer_pool_.end(),
+ [](TimerSPtr timer) { return !timer->is_running(); }),
+ end_stream_timer_pool_.end());
}
}