[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - external/boost

[Libreoffice Gerrit user]

 external/boost/UnpackedTarball_boost.mk          |    3 +++
 external/boost/boost.Wfallthrough.warnings.patch |   12 ++++++++++++
 2 files changed, 15 insertions(+)

New commits:
commit 71cd269ace3272f71aa8178c31602293dee7650c
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Tue Dec 11 15:37:28 2018 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Tue Dec 11 15:37:28 2018 +0100

    -Werror=implicit-fallthrough= (GCC 7)
    
    Change-Id: I404cea124ee8043179ac7db58c5a0d644d188a01

diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk
index 728b3c382713..0130b1310e7f 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -88,6 +88,9 @@ boost_patches += boost_1_60_0.android.undef.warning.patch
 # Clang -Wimplicit-fallthrough":
 boost_patches += fallthrough.patch.0
 
+# Backport from boost 1.66 - fix gcc7 warnings
+boost_patches += boost.Wfallthrough.warnings.patch
+
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL)))
diff --git a/external/boost/boost.Wfallthrough.warnings.patch b/external/boost/boost.Wfallthrough.warnings.patch
new file mode 100644
index 000000000000..beba0c59f5ff
--- /dev/null
+++ b/external/boost/boost.Wfallthrough.warnings.patch
@@ -0,0 +1,12 @@
+--- a/boost/boost/config/compiler/gcc.hpp	2015-12-08 19:55:19.000000000 +0100
++++ b/boost/boost/config/compiler/gcc.hpp	2018-12-11 15:31:29.015359148 +0100
+@@ -67,6 +67,9 @@
+ # define BOOST_NO_EXCEPTIONS
+ #endif
+ 
++#if __GNUC__ >= 7
++#  define BOOST_FALLTHROUGH __attribute__((fallthrough))
++#endif
+ 
+ //
+ // Threading support: Turn this on unconditionally here (except for