[Libreoffice-commits] core.git: external/boost

[Stephan Bergmann]

 external/boost/UnpackedTarball_boost.mk |    2 ++
 external/boost/ubsan.patch.0            |   11 +++++++++++
 2 files changed, 13 insertions(+)

New commits:
commit e52948e7b735dc834d8d6b5fa9c5e72318c1dd9e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jan 7 17:49:25 2015 +0100

    external/boost: Work around -fsanitize=bool
    
    Change-Id: I4a34c2ced30770dace39ffd39a530f719174ca7e

diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk
index 3a760fd..09295d0 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -107,6 +107,8 @@ boost_patches += boost.signal2.Wshadow.warnings.patch
 boost_patches += boost.boost_static_assert_unused_attribute.patch.0
 boost_patches += w4702.patch.0
 
+boost_patches += ubsan.patch.0
+
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL)))
diff --git a/external/boost/ubsan.patch.0 b/external/boost/ubsan.patch.0
new file mode 100644
index 0000000..5f378c0
--- /dev/null
+++ b/external/boost/ubsan.patch.0
@@ -0,0 +1,11 @@
+--- boost/algorithm/string/find_iterator.hpp
++++ boost/algorithm/string/find_iterator.hpp
+@@ -240,7 +240,7 @@
+                 m_Match(Other.m_Match),
+                 m_Next(Other.m_Next),
+                 m_End(Other.m_End),
+-                m_bEof(Other.m_bEof)
++                m_bEof(Other.eof())
+             {}
+ 
+             //! Constructor