mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

c++20: use std::erase(_if) instead of std::remove(_if)+erase (svl 2)

Browse Source 
Change-Id: I55c85a02e9dfc7d7cd2aaaec726fc5877a847264
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159849
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
This commit is contained in:
Julien Nabet
2023-11-23 10:04:27 +01:00
parent 2da3c1f0bf
commit cb753911e3
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
svl/source/svdde/ddesvr.cxx
View File

@@ -392,7 +392,7 @@ DdeService::~DdeService()
DdeInstData* pInst = ImpGetInstData(); DdeInstData* pInst = ImpGetInstData();
assert(pInst); assert(pInst);
if ( pInst->pServicesSvr ) 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 pSysTopic;
delete pName; delete pName;
@@ -608,8 +608,7 @@ DdeItem::DdeItem( const DdeItem& r)
DdeItem::~DdeItem() DdeItem::~DdeItem()
{ {
if( pMyTopic ) if( pMyTopic )
pMyTopic->aItems.erase(std::remove(pMyTopic->aItems.begin(), std::erase(pMyTopic->aItems, this);
pMyTopic->aItems.end(),this));
delete pName; delete pName;
delete pImpData; delete pImpData;
} }