[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - external/boost

[Michael Stahl]

 external/boost/UnpackedTarball_boost.mk              |    1 +
 external/boost/boost.function.Wplacement-new.patch.1 |   16 ++++++++++++++++
 2 files changed, 17 insertions(+)

New commits:
commit 0a15048b075a9a610ce7b660dabd3b723d489a6a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jun 29 15:09:41 2016 +0200

    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 at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk
index e52f6cd..af1210f 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 0000000..88908f1
--- /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