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

Stephan Bergmann sbergman at redhat.com
Tue Nov 10 05:24:46 PST 2015


 solenv/gbuild/platform/com_GCC_defs.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d5f19eb658d8b20619f5591f6de824741e348910
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 10 14:21:29 2015 +0100

    Avoid -Werror=pedantic when building CppunitTest_libreofficekit_checkapi
    
    ...at least the Linux-deb-x86_64 at 56-lhm-ubuntu-trusty tinderbox complains that
    
    > include/LibreOfficeKit/LibreOfficeKitInit.h:223:77: error: ISO C++ forbids casting between pointer-to-function and pointer-to-object [-Werror=pedantic]
    > pSym2 = (LokHookFunction2 *) lok_dlsym(dlhandle, "libreofficekit_hook_2");
    
    Change-Id: Ibd75a44fcc7da35ea32bde3fd2a300a16493789f

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 9de88a2..67af078 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -119,7 +119,7 @@ ifeq ($(COM_GCC_IS_CLANG),TRUE)
 gb_CXX03FLAGS := -std=gnu++98 -Werror=c++11-extensions -Wno-c++11-long-long \
     -Wno-deprecated-declarations
 else
-gb_CXX03FLAGS := -std=gnu++98 -pedantic-errors -Wno-long-long \
+gb_CXX03FLAGS := -std=gnu++98 -Wno-long-long \
     -Wno-variadic-macros -Wno-non-virtual-dtor -Wno-deprecated-declarations
 endif
 


More information about the Libreoffice-commits mailing list