external/boost/boost_1_60_0.undef.warning.patch | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
New commits:
commit b4d3f37ee0a7fd9b16eefa5f694fd2dff8a538fa
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Jan 28 11:31:56 2019 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jan 30 19:58:35 2019 +0100
external/boost/boost_1_60_0.undef.warning.patch should no longer be
necessary
...(at least the original BOOST_GCC_VERSION part) as Boost 1.69.0
boost/config/workaround.hpp contains
> #ifndef BOOST_GCC
> #define BOOST_GCC_WORKAROUND_GUARD 1
> #define BOOST_GCC_VERSION_WORKAROUND_GUARD 1
> #else
> #define BOOST_GCC_WORKAROUND_GUARD 0
> #define BOOST_GCC_VERSION_WORKAROUND_GUARD 0
> #endif
Change-Id: I7690db147dbe776ff51b94fc9950b890bb290bda
Reviewed-on: https://gerrit.libreoffice.org/67000
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/external/boost/boost_1_60_0.undef.warning.patch
b/external/boost/boost_1_60_0.undef.warning.patch
index 3f009220b93e..1e72d4e17a90 100644
--- a/external/boost/boost_1_60_0.undef.warning.patch
+++ b/external/boost/boost_1_60_0.undef.warning.patch
@@ -1,16 +1,10 @@
--- a/b/boost/boost/config/workaround.hpp
+++ a/b/boost/boost/config/workaround.hpp
-@@ -237,6 +237,19 @@
+@@ -237,6 +237,13 @@
#else
#define BOOST_INTEL_WORKAROUND_GUARD 0
#endif
+
-+#ifndef BOOST_GCC_VERSION
-+#define BOOST_GCC_VERSION_WORKAROUND_GUARD 1
-+#else
-+#define BOOST_GCC_VERSION_WORKAROUND_GUARD 0
-+#endif
-+
+#ifndef __clang_major__
+#define __clang_major___WORKAROUND_GUARD 1
+#else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
