svl/source/svdde/ddesvr.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit cb753911e3df1531e8b77027fa34e952566052eb
Author:     Julien Nabet <[email protected]>
AuthorDate: Thu Nov 23 10:04:27 2023 +0100
Commit:     Julien Nabet <[email protected]>
CommitDate: Thu Nov 23 14:40:35 2023 +0100

    c++20: use std::erase(_if) instead of std::remove(_if)+erase (svl 2)
    
    Change-Id: I55c85a02e9dfc7d7cd2aaaec726fc5877a847264
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159849
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <[email protected]>

diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index 1ce98b554a6e..327fb9a8f5d3 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -392,7 +392,7 @@ DdeService::~DdeService()
     DdeInstData* pInst = ImpGetInstData();
     assert(pInst);
     if ( pInst->pServicesSvr )
-        pInst->pServicesSvr->erase(std::remove(pInst->pServicesSvr->begin(), 
pInst->pServicesSvr->end(), this), pInst->pServicesSvr->end());
+        std::erase(*pInst->pServicesSvr, this);
 
     delete pSysTopic;
     delete pName;
@@ -608,8 +608,7 @@ DdeItem::DdeItem( const DdeItem& r)
 DdeItem::~DdeItem()
 {
     if( pMyTopic )
-        pMyTopic->aItems.erase(std::remove(pMyTopic->aItems.begin(),
-                                           pMyTopic->aItems.end(),this));
+        std::erase(pMyTopic->aItems, this);
     delete pName;
     delete pImpData;
 }

Reply via email to