external/boost/gcc6-warnings.patch.0 | 16 ++++++++++++++--
external/clucene/patches/clucene-warnings.patch | 8 +++++++-
2 files changed, 21 insertions(+), 3 deletions(-)
New commits:
commit dda3fc05a2900539836f9748d418dc56247a2ddc
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Jan 20 19:20:23 2016 +0100
Fix for Jenkins Gerrit Mac builds
...which choke on
#pragma GCC diagnostic ignored "-Wpragmas"
Change-Id: I40100b43078320b79cb9e3d4e3fb369db0bed9fe
diff --git a/external/boost/gcc6-warnings.patch.0
b/external/boost/gcc6-warnings.patch.0
index e5f7b2d..66ea135 100644
--- a/external/boost/gcc6-warnings.patch.0
+++ b/external/boost/gcc6-warnings.patch.0
@@ -1,14 +1,20 @@
--- 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__
+#pragma GCC diagnostic pop
@@ -18,15 +24,21 @@
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__
+#pragma GCC diagnostic pop
diff --git a/external/clucene/patches/clucene-warnings.patch
b/external/clucene/patches/clucene-warnings.patch
index 270451d..6326f6c 100644
--- a/external/clucene/patches/clucene-warnings.patch
+++ b/external/clucene/patches/clucene-warnings.patch
@@ -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>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
