diff options
| author | JackLivio <jack@livio.io> | 2020-04-03 10:53:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-03 13:53:55 -0400 |
| commit | e560d3431a5434283db5a26db539678e7e6408eb (patch) | |
| tree | 47cbb1e186b1c8f805e6f22c473aefad3bd749dd | |
| parent | d8c4ac3251a40f81a28deabd5be9a7597a26b8e9 (diff) | |
| download | sdl_core-e560d3431a5434283db5a26db539678e7e6408eb.tar.gz | |
Fix remove_if in ClearTimerPool (#3322)
| -rw-r--r-- | src/components/application_manager/src/application_manager_impl.cc | 17 |
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 51b2f272d6..4b8a265b2e 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -3839,16 +3839,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()); } } |