bin/gen-boost-headers | 5 + external/boost/UnpackedTarball_boost.mk | 4 - external/boost/boost.tuple_basic.Wundef.warnings.patch | 34 ---------- external/boost/include/boost/config.hpp | 23 ++++++ external/boost/include/boost/math/constants/constants.hpp | 23 ++++++ external/boost/include/boost/multi_index/composite_key.hpp | 23 ++++++ external/boost/include/boost/multi_index/identity.hpp | 23 ++++++ external/boost/include/boost/multi_index/mem_fun.hpp | 23 ++++++ external/boost/include/boost/multi_index/ordered_index.hpp | 23 ++++++ external/boost/include/boost/multi_index/random_access_index.hpp | 23 ++++++ external/boost/include/boost/multi_index_container.hpp | 23 ++++++ 11 files changed, 188 insertions(+), 39 deletions(-)
New commits: commit fae3b4cc192dbce54f87a6e1c67ab5d824eda947 Author: Michael Stahl <[email protected]> Date: Mon Aug 29 16:39:32 2016 +0200 boost: update generated wrapper headers ... and delete recently added clang Wundef patch Change-Id: I83af127fe98ff23feb944eb68dbd2334d23564c8 diff --git a/bin/gen-boost-headers b/bin/gen-boost-headers index 8342f88..40f4ba8 100755 --- a/bin/gen-boost-headers +++ b/bin/gen-boost-headers @@ -19,10 +19,13 @@ rm -rf ${GENDIR} mkdir ${GENDIR} # note: clucene contains a copy of half of boost, so ignore it too +# note: firebird contains a copy of half of boost, so ignore it too cat <(cd ${SRCDIR} && git grep '^# *include') \ <(find ${WORKDIR}/UnpackedTarball/ -mindepth 1 -maxdepth 1 -type d \ - | grep -v boost | grep -v clucene \ + | grep -v boost \ + | grep -v clucene \ + | grep -v firebird \ | xargs grep -r '^# *include') \ | grep -o '\bboost.*\.\(h\|hpp\|ipp\)' \ | sort | uniq \ diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index 0bdb6eb..604f882 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -40,10 +40,6 @@ boost_patches += boost_1_60_0.quadmath.patch boost_patches += boost_1_60_0.undef.warning.patch boost_patches += boost_1_60_0.android.undef.warning.patch -# This patch is from upstream -# https://github.com/boostorg/tuple/commit/8b6613e592824b30d48a9252604172abfa33c5f2 -boost_patches += boost.tuple_basic.Wundef.warnings.patch - $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL))) diff --git a/external/boost/boost.tuple_basic.Wundef.warnings.patch b/external/boost/boost.tuple_basic.Wundef.warnings.patch deleted file mode 100644 index 778f4cc..0000000 --- a/external/boost/boost.tuple_basic.Wundef.warnings.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8b6613e592824b30d48a9252604172abfa33c5f2 Mon Sep 17 00:00:00 2001 -From: Dmitry Marakasov <[email protected]> -Date: Tue, 1 Mar 2016 13:54:12 +0300 -Subject: [PATCH] Only check for BOOST_GCC when it's defined - -This fixes warnings with clang: - -/usr/local/include/boost/tuple/detail/tuple_basic.hpp:44:5: warning: 'BOOST_GCC' is not defined, evaluates to 0 [-Wundef] ---- - include/boost/tuple/detail/tuple_basic.hpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/boost/tuple/detail/tuple_basic.hpp b/include/boost/tuple/detail/tuple_basic.hpp -index 9a3b34e..a688309 100644 ---- a/a/include/boost/tuple/detail/tuple_basic.hpp -+++ b/b/include/boost/tuple/detail/tuple_basic.hpp -@@ -41,7 +41,7 @@ - - #include "boost/detail/workaround.hpp" // needed for BOOST_WORKAROUND - --#if BOOST_GCC >= 40700 -+#if defined(BOOST_GCC) && (BOOST_GCC >= 40700) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wunused-local-typedefs" - #endif -@@ -979,7 +979,7 @@ inline void swap(tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>& lhs, - } // end of namespace boost - - --#if BOOST_GCC >= 40700 -+#if defined(BOOST_GCC) && (BOOST_GCC >= 40700) - #pragma GCC diagnostic pop - #endif - diff --git a/external/boost/include/boost/config.hpp b/external/boost/include/boost/config.hpp new file mode 100644 index 0000000..880e40d --- /dev/null +++ b/external/boost/include/boost/config.hpp @@ -0,0 +1,23 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunknown-pragmas" /* first! for clang */ +#pragma GCC diagnostic ignored "-Wpragmas" /* second! for GCC */ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/config.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/math/constants/constants.hpp b/external/boost/include/boost/math/constants/constants.hpp new file mode 100644 index 0000000..50ceb2e --- /dev/null +++ b/external/boost/include/boost/math/constants/constants.hpp @@ -0,0 +1,23 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunknown-pragmas" /* first! for clang */ +#pragma GCC diagnostic ignored "-Wpragmas" /* second! for GCC */ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/math/constants/constants.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/multi_index/composite_key.hpp b/external/boost/include/boost/multi_index/composite_key.hpp new file mode 100644 index 0000000..a8f96bf --- /dev/null +++ b/external/boost/include/boost/multi_index/composite_key.hpp @@ -0,0 +1,23 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunknown-pragmas" /* first! for clang */ +#pragma GCC diagnostic ignored "-Wpragmas" /* second! for GCC */ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/multi_index/composite_key.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/multi_index/identity.hpp b/external/boost/include/boost/multi_index/identity.hpp new file mode 100644 index 0000000..2fe2bd2 --- /dev/null +++ b/external/boost/include/boost/multi_index/identity.hpp @@ -0,0 +1,23 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunknown-pragmas" /* first! for clang */ +#pragma GCC diagnostic ignored "-Wpragmas" /* second! for GCC */ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/multi_index/identity.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/multi_index/mem_fun.hpp b/external/boost/include/boost/multi_index/mem_fun.hpp new file mode 100644 index 0000000..4044920 --- /dev/null +++ b/external/boost/include/boost/multi_index/mem_fun.hpp @@ -0,0 +1,23 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunknown-pragmas" /* first! for clang */ +#pragma GCC diagnostic ignored "-Wpragmas" /* second! for GCC */ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/multi_index/mem_fun.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/multi_index/ordered_index.hpp b/external/boost/include/boost/multi_index/ordered_index.hpp new file mode 100644 index 0000000..a5c72c2 --- /dev/null +++ b/external/boost/include/boost/multi_index/ordered_index.hpp @@ -0,0 +1,23 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunknown-pragmas" /* first! for clang */ +#pragma GCC diagnostic ignored "-Wpragmas" /* second! for GCC */ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/multi_index/ordered_index.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/multi_index/random_access_index.hpp b/external/boost/include/boost/multi_index/random_access_index.hpp new file mode 100644 index 0000000..a97a3bc --- /dev/null +++ b/external/boost/include/boost/multi_index/random_access_index.hpp @@ -0,0 +1,23 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunknown-pragmas" /* first! for clang */ +#pragma GCC diagnostic ignored "-Wpragmas" /* second! for GCC */ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/multi_index/random_access_index.hpp> +#pragma GCC diagnostic pop diff --git a/external/boost/include/boost/multi_index_container.hpp b/external/boost/include/boost/multi_index_container.hpp new file mode 100644 index 0000000..87ba04b --- /dev/null +++ b/external/boost/include/boost/multi_index_container.hpp @@ -0,0 +1,23 @@ +/* generated by bin/gen-boost-headers, do not edit! */ +#pragma once +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunknown-pragmas" /* first! for clang */ +#pragma GCC diagnostic ignored "-Wpragmas" /* second! for GCC */ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#pragma GCC diagnostic ignored "-Wextra" +#pragma GCC diagnostic ignored "-Wignored-qualifiers" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#pragma GCC diagnostic ignored "-Winvalid-constexpr" +#pragma GCC diagnostic ignored "-Wplacement-new" +#pragma GCC diagnostic ignored "-Wreturn-type" +#pragma GCC diagnostic ignored "-Wshadow" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#pragma GCC diagnostic ignored "-Wtype-limits" +#pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#pragma GCC diagnostic ignored "-Wunused-macros" +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-variable" +#include_next <boost/multi_index_container.hpp> +#pragma GCC diagnostic pop _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
