|
 |
135360 |
From f351aa3ba01945a3219cf4fb0cbb7de01a415dab Mon Sep 17 00:00:00 2001
|
|
|
135360 |
From: Stephan Bergmann <sbergman@redhat.com>
|
|
|
135360 |
Date: Tue, 10 Nov 2015 14:21:29 +0100
|
|
|
135360 |
Subject: [PATCH 298/398] Avoid -Werror=pedantic when building
|
|
|
135360 |
CppunitTest_libreofficekit_checkapi
|
|
|
135360 |
|
|
|
135360 |
...at least the Linux-deb-x86_64@56-lhm-ubuntu-trusty tinderbox complains that
|
|
|
135360 |
|
|
|
135360 |
> include/LibreOfficeKit/LibreOfficeKitInit.h:223:77: error: ISO C++ forbids casting between pointer-to-function and pointer-to-object [-Werror=pedantic]
|
|
|
135360 |
> pSym2 = (LokHookFunction2 *) lok_dlsym(dlhandle, "libreofficekit_hook_2");
|
|
|
135360 |
|
|
|
135360 |
Change-Id: Ibd75a44fcc7da35ea32bde3fd2a300a16493789f
|
|
|
135360 |
(cherry picked from commit d5f19eb658d8b20619f5591f6de824741e348910)
|
|
|
135360 |
---
|
|
|
135360 |
solenv/gbuild/platform/com_GCC_defs.mk | 2 +-
|
|
|
135360 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
135360 |
|
|
|
135360 |
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
|
|
|
135360 |
index a062d8c33e77..05ffd91780cf 100644
|
|
|
135360 |
--- a/solenv/gbuild/platform/com_GCC_defs.mk
|
|
|
135360 |
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
|
|
|
135360 |
@@ -119,7 +119,7 @@ ifeq ($(COM_GCC_IS_CLANG),TRUE)
|
|
|
135360 |
gb_CXX03FLAGS := -std=gnu++98 -Werror=c++11-extensions -Wno-c++11-long-long \
|
|
|
135360 |
-Wno-deprecated-declarations
|
|
|
135360 |
else
|
|
|
135360 |
-gb_CXX03FLAGS := -std=gnu++98 -pedantic-errors -Wno-long-long \
|
|
|
135360 |
+gb_CXX03FLAGS := -std=gnu++98 -Wno-long-long \
|
|
|
135360 |
-Wno-variadic-macros -Wno-non-virtual-dtor -Wno-deprecated-declarations
|
|
|
135360 |
endif
|
|
|
135360 |
|
|
|
135360 |
--
|
|
|
135360 |
2.12.0
|
|
|
135360 |
|