mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for Jenkins Gerrit Mac builds

Browse Source 
...which choke on

  #pragma GCC diagnostic ignored "-Wpragmas"

Change-Id: I40100b43078320b79cb9e3d4e3fb369db0bed9fe
This commit is contained in:
Stephan Bergmann 2016-01-20 19:20:23 +01:00
parent e941434d98
commit dda3fc05a2
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
external/boost/gcc6-warnings.patch.0 vendored
View File

@ -1,13 +1,19 @@
--- boost/function/function_base.hpp
+++ boost/function/function_base.hpp
@@ -305,7 +305,15 @@
@@ -305,7 +305,21 @@
if (op == clone_functor_tag || op == move_functor_tag) {
const functor_type* in_functor =
static_cast<const functor_type*>(static_cast<void*>(&in_buffer.data));
+#if defined __GNUC__
+#pragma GCC diagnostic push
+#if defined __clang__
+#if __has_warning("-Wplacement-new")
+#pragma GCC diagnostic ignored "-Wplacement-new"
+#endif
+#else
+#pragma GCC diagnostic ignored "-Wpragmas"
+#pragma GCC diagnostic ignored "-Wplacement-new"
+#endif
+#endif
new (reinterpret_cast<void*>(&out_buffer.data)) functor_type(*in_functor);
+#if defined __GNUC__
@ -18,14 +24,20 @@
functor_type* f = static_cast<functor_type*>(static_cast<void*>(&in_buffer.data));
--- boost/function/function_template.hpp
+++ boost/function/function_template.hpp
@@ -569,7 +569,15 @@
@@ -569,7 +569,21 @@
void
assign_functor(FunctionObj f, function_buffer& functor, mpl::true_) const
{
+#if defined __GNUC__
+#pragma GCC diagnostic push
+#if defined __clang__
+#if __has_warning("-Wplacement-new")
+#pragma GCC diagnostic ignored "-Wplacement-new"
+#endif
+#else
+#pragma GCC diagnostic ignored "-Wpragmas"
+#pragma GCC diagnostic ignored "-Wplacement-new"
+#endif
+#endif
new (reinterpret_cast<void*>(&functor.data)) FunctionObj(f);
+#if defined __GNUC__

8
external/clucene/patches/clucene-warnings.patch vendored
View File

@ -69,7 +69,7 @@
#endif
--- src/core/CLucene/util/Array.h 2012-02-22 12:37:22.510637696 +0000
+++ src/core/CLucene/util/Array.h 2012-02-22 12:38:33.714444884 +0000
@@ -7,6 +7,14 @@
@@ -7,6 +7,20 @@
#ifndef _lucene_util_Array_
#define _lucene_util_Array_
@ -77,9 +77,15 @@
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wshadow"
+# pragma GCC diagnostic ignored "-Wunused-parameter"
+#if defined __clang__
+#if __has_warning("-Wmisleading-indentation")
+#pragma GCC diagnostic ignored "-Wmisleading-indentation"
+#endif
+#else
+# pragma GCC diagnostic ignored "-Wpragmas"
+# pragma GCC diagnostic ignored "-Wmisleading-indentation"
+#endif
+#endif
+
#include <stdlib.h>
#include <string.h>