diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-01-11 16:20:56 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-01-11 21:30:08 +0100 |
| commit | 2a78d281dc116df16dc158d430262b207ff1e482 (patch) | |
| tree | 432b9b75c3a1fb5245a68beceef2017b79549fea | |
| parent | 3e977806448327c13030f74d34ed8ad340c3f48b (diff) | |
Drop external/boost/boost.gcc47679.patch
The corresponding <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47679>
"[5 Regression] Strange uninitialized warning after SRA" is claimed to be fixed
in GCC 6, so should no longer be needed (with our current baseline of GCC 7).
Change-Id: Ia9435dbf6644639961094d6bfb47e47500ab70b7
Reviewed-on: https://gerrit.libreoffice.org/66181
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | external/boost/UnpackedTarball_boost.mk | 3 | ||||
| -rw-r--r-- | external/boost/boost.gcc47679.patch | 63 |
2 files changed, 0 insertions, 66 deletions
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index f23fe6553529..ca83476d95ee 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -9,9 +9,6 @@ boost_patches := -#http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47679 -boost_patches += boost.gcc47679.patch - #https://svn.boost.org/trac/boost/ticket/6142 boost_patches += boost.6142.warnings.patch.1 diff --git a/external/boost/boost.gcc47679.patch b/external/boost/boost.gcc47679.patch deleted file mode 100644 index 38a8be7a6975..000000000000 --- a/external/boost/boost.gcc47679.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -ru boost.orig/boost/optional/detail/optional_aligned_storage.hpp boost/boost/optional/detail/optional_aligned_storage.hpp ---- foo/misc/boost.orig/boost/optional/detail/optional_aligned_storage.hpp 2015-07-18 11:27:36.168127029 +0200 -+++ foo/misc/boost/boost/optional/detail/optional_aligned_storage.hpp 2015-07-18 20:36:13.777997833 +0200 -@@ -14,6 +14,8 @@ - #ifndef BOOST_OPTIONAL_OPTIONAL_DETAIL_OPTIONAL_ALIGNED_STORAGE_AJK_12FEB2016_HPP - #define BOOST_OPTIONAL_OPTIONAL_DETAIL_OPTIONAL_ALIGNED_STORAGE_AJK_12FEB2016_HPP - -+#include <string.h> -+ - namespace boost { - - namespace optional_detail { -@@ -39,6 +41,11 @@ class aligned_storage - - public: - -+ aligned_storage() -+ { -+ memset(&dummy_, 0, sizeof(dummy_)); -+ } -+ - #if defined(BOOST_OPTIONAL_DETAIL_USE_ATTRIBUTE_MAY_ALIAS) - void const* address() const { return &dummy_; } - void * address() { return &dummy_; } -diff -ru boost.orig/boost/spirit/home/classic/core/primitives/impl/numerics.ipp boost/boost/spirit/home/classic/core/primitives/impl/numerics.ipp ---- foo/misc/boost.orig/boost/spirit/home/classic/core/primitives/impl/numerics.ipp 2015-07-18 11:27:36.169127029 +0200 -+++ foo/misc/boost/boost/spirit/home/classic/core/primitives/impl/numerics.ipp 2015-07-18 20:34:32.110998976 +0200 -@@ -218,6 +218,19 @@ - } - } - }; -+ template <int Radix> -+ struct negative_accumulate<unsigned char, Radix> -+ { -+ // Use this accumulator if number is negative -+ static bool add(unsigned char& n, unsigned digit) -+ { -+ n *= Radix; -+ if (n < digit) -+ return false; -+ n -= digit; -+ return true; -+ } -+ }; - - template <int MaxDigits> - inline bool allow_more_digits(std::size_t i) -diff -ru boost.orig/boost/utility/compare_pointees.hpp boost/boost/utility/compare_pointees.hpp ---- foo/misc/boost.orig/boost/utility/compare_pointees.hpp 2015-02-27 07:26:11.000000000 +0100 -+++ foo/misc/boost/boost/utility/compare_pointees.hpp 2015-07-18 20:20:41.388988458 +0200 -@@ -29,7 +29,11 @@ - inline - bool equal_pointees ( OptionalPointee const& x, OptionalPointee const& y ) - { -- return (!x) != (!y) ? false : ( !x ? true : (*x) == (*y) ) ; -+ if (!x && !y) -+ return true; -+ if (!x || !y) -+ return false; -+ return (*x) == (*y); - } - - template<class OptionalPointee> |