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

[Julien Nabet]

 cppu/source/typelib/typelib.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 05ff3d112b79202f393f9067fec4fe72f2d8ac3c
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Mar 10 22:05:57 2016 +0100

    Let's use the iterator return by erase method of iterator list
    
    and avoid to retrieve list->begin and loop from the first element
    
    Change-Id: I536b7a03c4033b02a7226d25f64764c10c28bdd0
    Reviewed-on: https://gerrit.libreoffice.org/23126
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 254abd76..55ee766 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -354,12 +354,11 @@ extern "C" void SAL_CALL typelib_typedescription_revokeCallback(
 //          OslGuard aGuard( rInit.getMutex() );
         CallbackEntry aEntry( pContext, pCallback );
         CallbackSet_Impl::iterator iPos( rInit.pCallbacks->begin() );
-        while (!(iPos == rInit.pCallbacks->end()))
+        while (iPos != rInit.pCallbacks->end())
         {
             if (*iPos == aEntry)
             {
-                rInit.pCallbacks->erase( iPos );
-                iPos = rInit.pCallbacks->begin();
+                iPos = rInit.pCallbacks->erase(iPos);
             }
             else
             {