[Libreoffice-commits] core.git: canvas/source cppu/source

[Julien Nabet (via logerrit)]

 canvas/source/tools/page.cxx                |    5 +----
 canvas/source/tools/spriteredrawmanager.cxx |    2 +-
 cppu/source/threadpool/threadpool.cxx       |    2 +-
 cppu/source/typelib/typelib.cxx             |    3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit d0b0908e62fd6e4901061b43deeb8ae4cf2ed799
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Nov 18 12:55:53 2023 +0100
Commit:     Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sat Nov 18 20:27:47 2023 +0100

    c++20: use std::erase instead of std::removed followed by erase (part 2)
    
    Change-Id: I0222f0f53f387dd57bd674b1e137b53487f4e1d3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159611
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>

diff --git a/canvas/source/tools/page.cxx b/canvas/source/tools/page.cxx
index ddf516a926f6..32eedb71b29f 100644
--- a/canvas/source/tools/page.cxx
+++ b/canvas/source/tools/page.cxx
@@ -76,10 +76,7 @@ namespace canvas
         // be relocated to some other page or it will
         // currently be deleted. in either case, simply
         // remove the reference from our internal storage.
-        FragmentContainer_t::iterator it(
-            std::remove(
-                mpFragments.begin(),mpFragments.end(),pFragment));
-        mpFragments.erase(it,mpFragments.end());
+        std::erase(mpFragments, pFragment);
     }
 
     bool Page::insert( SurfaceRect& r )
diff --git a/canvas/source/tools/spriteredrawmanager.cxx 
b/canvas/source/tools/spriteredrawmanager.cxx
index e67fca6cce1c..06eb6d1de594 100644
--- a/canvas/source/tools/spriteredrawmanager.cxx
+++ b/canvas/source/tools/spriteredrawmanager.cxx
@@ -455,7 +455,7 @@ namespace canvas
 
     void SpriteRedrawManager::hideSprite( const Sprite::Reference& rSprite )
     {
-        maSprites.erase(std::remove(maSprites.begin(), maSprites.end(), 
rSprite), maSprites.end());
+        std::erase(maSprites, rSprite);
     }
 
     void SpriteRedrawManager::moveSprite( const Sprite::Reference&      
rSprite,
diff --git a/cppu/source/threadpool/threadpool.cxx 
b/cppu/source/threadpool/threadpool.cxx
index a65bdcfaf625..a74d8678d986 100644
--- a/cppu/source/threadpool/threadpool.cxx
+++ b/cppu/source/threadpool/threadpool.cxx
@@ -62,7 +62,7 @@ namespace cppu_threadpool
     void DisposedCallerAdmin::destroy( void const * nDisposeId )
     {
         std::scoped_lock guard( m_mutex );
-        m_vector.erase(std::remove(m_vector.begin(), m_vector.end(), 
nDisposeId), m_vector.end());
+        std::erase(m_vector, nDisposeId);
     }
 
     bool DisposedCallerAdmin::isDisposed( void const * nDisposeId )
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index e2e87b03ff10..e665b2b4273e 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -293,8 +293,7 @@ extern "C" void SAL_CALL 
typelib_typedescription_revokeCallback(
         // todo mt safe: guard is no solution, can not acquire while calling 
callback!
 //          OslGuard aGuard( rInit.getMutex() );
         CallbackEntry aEntry( pContext, pCallback );
-        rInit.maCallbacks.erase(std::remove(rInit.maCallbacks.begin(), 
rInit.maCallbacks.end(), aEntry),
-                                rInit.maCallbacks.end());
+        std::erase(rInit.maCallbacks, aEntry);
     }
 }