From 2ea548e394a504a2277a17f333f862540d48b817 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sun, 19 Nov 2023 21:33:18 +0100 Subject: [PATCH] c++20: use std::erase(_if) instead of std::remove(_if)+erase (unotools) Change-Id: Iebc949486322b55f60e83b27739acc1c16d2a25e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159707 Tested-by: Jenkins Reviewed-by: Julien Nabet --- unotools/source/config/configmgr.cxx | 2 +- unotools/source/misc/desktopterminationobserver.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index f3aef792e856..e19c7c694a6a 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -157,7 +157,7 @@ utl::ConfigManager::addConfigItem(utl::ConfigItem & item) { } void utl::ConfigManager::removeConfigItem(utl::ConfigItem & item) { - items_.erase(std::remove(items_.begin(), items_.end(), &item), items_.end()); + std::erase(items_, &item); } void utl::ConfigManager::registerConfigItem(utl::ConfigItem * item) { diff --git a/unotools/source/misc/desktopterminationobserver.cxx b/unotools/source/misc/desktopterminationobserver.cxx index 138125a4fc10..2eeb44a92dda 100644 --- a/unotools/source/misc/desktopterminationobserver.cxx +++ b/unotools/source/misc/desktopterminationobserver.cxx @@ -180,7 +180,7 @@ namespace utl { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); Listeners& rListeners = getListenerAdminData().aListeners; - rListeners.erase(std::remove(rListeners.begin(), rListeners.end(), _pListener), rListeners.end()); + std::erase(rListeners, _pListener); } } // namespace utl