LOK: tilebench improvements
[LibreOffice.git] / external / boost / boost.gcc47679.patch
blob38a8be7a6975703a6fd9f9cd1068a517ba083c43
1 diff -ru boost.orig/boost/optional/detail/optional_aligned_storage.hpp boost/boost/optional/detail/optional_aligned_storage.hpp
2 --- foo/misc/boost.orig/boost/optional/detail/optional_aligned_storage.hpp 2015-07-18 11:27:36.168127029 +0200
3 +++ foo/misc/boost/boost/optional/detail/optional_aligned_storage.hpp 2015-07-18 20:36:13.777997833 +0200
4 @@ -14,6 +14,8 @@
5 #ifndef BOOST_OPTIONAL_OPTIONAL_DETAIL_OPTIONAL_ALIGNED_STORAGE_AJK_12FEB2016_HPP
6 #define BOOST_OPTIONAL_OPTIONAL_DETAIL_OPTIONAL_ALIGNED_STORAGE_AJK_12FEB2016_HPP
8 +#include <string.h>
10 namespace boost {
12 namespace optional_detail {
13 @@ -39,6 +41,11 @@ class aligned_storage
15 public:
17 + aligned_storage()
18 + {
19 + memset(&dummy_, 0, sizeof(dummy_));
20 + }
22 #if defined(BOOST_OPTIONAL_DETAIL_USE_ATTRIBUTE_MAY_ALIAS)
23 void const* address() const { return &dummy_; }
24 void * address() { return &dummy_; }
25 diff -ru boost.orig/boost/spirit/home/classic/core/primitives/impl/numerics.ipp boost/boost/spirit/home/classic/core/primitives/impl/numerics.ipp
26 --- foo/misc/boost.orig/boost/spirit/home/classic/core/primitives/impl/numerics.ipp 2015-07-18 11:27:36.169127029 +0200
27 +++ foo/misc/boost/boost/spirit/home/classic/core/primitives/impl/numerics.ipp 2015-07-18 20:34:32.110998976 +0200
28 @@ -218,6 +218,19 @@
32 + template <int Radix>
33 + struct negative_accumulate<unsigned char, Radix>
34 + {
35 + // Use this accumulator if number is negative
36 + static bool add(unsigned char& n, unsigned digit)
37 + {
38 + n *= Radix;
39 + if (n < digit)
40 + return false;
41 + n -= digit;
42 + return true;
43 + }
44 + };
46 template <int MaxDigits>
47 inline bool allow_more_digits(std::size_t i)
48 diff -ru boost.orig/boost/utility/compare_pointees.hpp boost/boost/utility/compare_pointees.hpp
49 --- foo/misc/boost.orig/boost/utility/compare_pointees.hpp 2015-02-27 07:26:11.000000000 +0100
50 +++ foo/misc/boost/boost/utility/compare_pointees.hpp 2015-07-18 20:20:41.388988458 +0200
51 @@ -29,7 +29,11 @@
52 inline
53 bool equal_pointees ( OptionalPointee const& x, OptionalPointee const& y )
55 - return (!x) != (!y) ? false : ( !x ? true : (*x) == (*y) ) ;
56 + if (!x && !y)
57 + return true;
58 + if (!x || !y)
59 + return false;
60 + return (*x) == (*y);
63 template<class OptionalPointee>