[Libreoffice-commits] core.git: 2 commits - solenv/gbuild sw/source

[Stephan Bergmann]

 solenv/gbuild/platform/com_GCC_defs.mk |    7 +++++++
 sw/source/filter/ww8/ww8par2.cxx       |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit e8efbffc83e926c2af0a92cc2c2d3d29cfaa7478
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 23 16:30:15 2018 +0100

    Reuse WW8TabBandDesc::setcelldefaults
    
    Change-Id: Icdf57d962ae7b3e24cbed6aba4b05fa2136b3761
    Reviewed-on: https://gerrit.libreoffice.org/48433
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 59abfb5e8eca..99f65112fa26 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2306,7 +2306,7 @@ void WW8TabDesc::CalcDefaults()
         if( !pR->pTCs )
         {
             pR->pTCs = new WW8_TCell[ pR->nWwCols ];
-            memset( pR->pTCs, 0, pR->nWwCols * sizeof( WW8_TCell ) );
+            WW8TabBandDesc::setcelldefaults(pR->pTCs, pR->nWwCols);
         }
         for (int k = 0; k < pR->nWwCols; ++k)
         {
commit ce99754e9b5b954be4360f39356ed7198b298265
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 23 16:23:20 2018 +0100

    Globally disable -Wcast-function-type new with upcoming GCC 8
    
    ...which unhelpfully even warns on reinterpret_cast, so causes failures like
    
    > [CXX] sal/osl/unx/signal.cxx
    > sal/osl/unx/signal.cxx: In function ‘bool onInitSignal()’:
    > sal/osl/unx/signal.cxx:267:50: error: cast between incompatible function types from ‘void (*)(int, siginfo_t*, void*)’ to ‘{anonymous}::Handler1’ {aka ‘void (*)(int)’} [-Werror=cast-function-type]
    >                                  oact.sa_sigaction);
    >                                                   ^
    
    And since all incompatible (but deliberate) casts between function types across
    our code base should already be written as reinterpret_cast, we shouldn't lose
    much by just disabling this new warning globally.
    
    Change-Id: If15e9606e8fdc676b61012e31d7369653951ceca
    Reviewed-on: https://gerrit.libreoffice.org/48431
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 68de52a41593..4dc10e5bfccc 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -96,6 +96,13 @@ gb_CXXFLAGS_COMMON += \
     -Wunused-const-variable=1
 endif
 
+# GCC 8 -Wcast-function-type (included in -Wextra) unhelpfully even warns on reinterpret_cast
+# between incompatible function types:
+ifeq ($(shell expr '$(GCC_VERSION)' '>=' 800),1)
+gb_CXXFLAGS_COMMON += \
+    -Wno-cast-function-type
+endif
+
 ifeq ($(COM_IS_CLANG),TRUE)
 gb_CXXFLAGS_COMMON += -Wimplicit-fallthrough
 else