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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Mar 15 15:55:33 UTC 2019


 sfx2/source/control/dispatch.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit ece27693ba52417bc4b68045f5544a5cc43299dc
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Mar 15 15:13:52 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Mar 15 16:54:58 2019 +0100

    Adapt to C++2a std::span<>::index_type being unsigned size_t
    
    ...and no longer signed ptrdiff_t (which now caused -Werror,-Wsign-compare here)
    
    Change-Id: I48234d9cc4c35583e3268441dcc21a03fab3e856
    Reviewed-on: https://gerrit.libreoffice.org/69306
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 06c04362f763..840ad03bd814 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -20,7 +20,6 @@
 #include <config_features.h>
 
 #include <algorithm>
-#include <cstddef>
 #include <deque>
 #include <vector>
 
@@ -1546,7 +1545,7 @@ void SfxDispatcher::SetSlotFilter(SfxSlotFilterState nEnable,
 {
 #ifdef DBG_UTIL
     // Check Array
-    for ( std::ptrdiff_t n = 1; n < pSIDs.size(); ++n )
+    for ( o3tl::span<sal_uInt16 const>::index_type n = 1; n < pSIDs.size(); ++n )
         DBG_ASSERT( pSIDs[n] > pSIDs[n-1], "SetSlotFilter: SIDs not sorted" );
 #endif
 


More information about the Libreoffice-commits mailing list