diff options
author | Michael Stahl <mstahl@redhat.com> | 2016-05-27 16:24:33 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2016-05-30 15:34:51 +0000 |
commit | e5c6574f5df8d2a5914beb03dce604beb8d62ee8 (patch) | |
tree | 0fe9ab88e396c5f1c5d1ee91be48690cb110bd85 /external/boost/boost.type_index.Wundef.warnings.patch | |
parent | 0002249b15d0d3aa89b7eafe0791921c0427abea (diff) |
boost: warning-patch-ectomy
Upstream maintainers, with few exceptions, generally don't care about
warnings in boost headers, hence we re-base our warning fix patches on
every upgrade, which is a pointless exercise in frustration.
Most of the patches are for GCC/Clang warnings, where we could use
-isystem to suppress the warnings (with corresponding hacks in the build
system, because -isystem also disables dependency generation) - but
clang-cl does not support -isystem.
So generate a bunch of wrapper headers into external/boost/include, that
disable all known warnings and use #include_next to get the real boost
header. This allows us to get rid of most of the existing patches.
There is however a bug in GCC that preprocessor warnings like -Wundef
cannot be disabled with a #pragma, so those patches cannot be removed.
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53431
Change-Id: I2992bf4a463015f1140489df867bd80757f84541
Reviewed-on: https://gerrit.libreoffice.org/25563
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external/boost/boost.type_index.Wundef.warnings.patch')
-rw-r--r-- | external/boost/boost.type_index.Wundef.warnings.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/external/boost/boost.type_index.Wundef.warnings.patch b/external/boost/boost.type_index.Wundef.warnings.patch new file mode 100644 index 000000000000..c542924239b7 --- /dev/null +++ b/external/boost/boost.type_index.Wundef.warnings.patch @@ -0,0 +1,12 @@ +diff -ru boost.orig/boost/type_index/stl_type_index.hpp boost/boost/type_index/stl_type_index.hpp +--- foo/misc/boost.orig/boost/type_index/stl_type_index.hpp 2015-06-21 22:16:46.000000000 +0200 ++++ foo/misc/boost/boost/type_index/stl_type_index.hpp 2015-07-16 22:55:42.886944806 +0200 +@@ -174,7 +174,7 @@ + + + inline std::size_t stl_type_index::hash_code() const BOOST_NOEXCEPT { +-#if _MSC_VER > 1600 || (__GNUC__ == 4 && __GNUC_MINOR__ > 5 && defined(__GXX_EXPERIMENTAL_CXX0X__)) ++#if (defined(_MSC_VER) && _MSC_VER > 1600) || (__GNUC__ == 4 && __GNUC_MINOR__ > 5 && defined(__GXX_EXPERIMENTAL_CXX0X__)) + return data_->hash_code(); + #else + return boost::hash_range(raw_name(), raw_name() + std::strlen(raw_name())); |