diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-06-29 15:09:41 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-06-29 14:44:27 +0000 |
| commit | 0a15048b075a9a610ce7b660dabd3b723d489a6a (patch) | |
| tree | f076d9823cd817ea701d1f9fdb77aa2114578e7e | |
| parent | 1ddc2f93c49660cf651f4faeb1f0f596eab953e2 (diff) | |
boost: suppress GCC6 -Wplacement-new=
function_base.hpp line 308
error: placement new constructing an object of type "boost::..." and
size ‘16’ in a region of type ‘char’ and size ‘1’
Change-Id: If905d56bd21dd30a957b50fa3d5eed3a63899d62
Reviewed-on: https://gerrit.libreoffice.org/26769
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | external/boost/UnpackedTarball_boost.mk | 1 | ||||
| -rw-r--r-- | external/boost/boost.function.Wplacement-new.patch.1 | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index e52f6cd57852..af1210fc5b4e 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -64,6 +64,7 @@ boost_patches += boost.wunused.patch boost_patches += boost.wdeprecated-auto_ptr.patch.0 boost_patches += boost.signal2.Wshadow.warnings.patch boost_patches += boost.boost_static_assert_unused_attribute.patch.0 +boost_patches += boost.function.Wplacement-new.patch.1 boost_patches += ubsan.patch.0 boost_patches += rtti.patch.0 diff --git a/external/boost/boost.function.Wplacement-new.patch.1 b/external/boost/boost.function.Wplacement-new.patch.1 new file mode 100644 index 000000000000..88908f11491f --- /dev/null +++ b/external/boost/boost.function.Wplacement-new.patch.1 @@ -0,0 +1,16 @@ +GCC 6 warns about function_buffer::data + +--- boost/boost/function/function_base.hpp.orig2 2016-06-29 13:54:55.270121431 +0200 ++++ boost/boost/function/function_base.hpp 2016-06-29 13:58:50.343103199 +0200 +@@ -37,6 +37,11 @@ + #include <boost/function_equal.hpp> + #include <boost/function/function_fwd.hpp> + ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 600) ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Wplacement-new=" ++#endif ++ + #if defined(BOOST_MSVC) + # pragma warning( push ) + # pragma warning( disable : 4793 ) // complaint about native code generation |