fix baseline build (old cairo) - 'cairo_rectangle_int_t' does not name a type
[LibreOffice.git] / external / boost / boost.gcc47679.patch
blobe62a874c1bfc524fc8db61330b2c0a84cd7500b7
1 --- misc/boost_1_44_0/boost/utility/compare_pointees.hpp 2011-02-10 16:39:05.960176555 +0000
2 +++ misc/build/boost_1_44_0/boost/utility/compare_pointees.hpp 2011-02-10 16:40:59.091423279 +0000
3 @@ -29,7 +29,11 @@
4 inline
5 bool equal_pointees ( OptionalPointee const& x, OptionalPointee const& y )
7 - return (!x) != (!y) ? false : ( !x ? true : (*x) == (*y) ) ;
8 + if (!x && !y)
9 + return true;
10 + if (!x || !y)
11 + return false;
12 + return (*x) == (*y);
15 template<class OptionalPointee>
16 --- misc/boost_1_44_0/boost/spirit/home/classic/core/primitives/impl/numerics.ipp 2011-03-02 12:22:47.222870106 +0000
17 +++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/primitives/impl/numerics.ipp 2011-03-02 12:22:47.222870106 +0000
18 @@ -219,6 +219,20 @@
22 + template <int Radix>
23 + struct negative_accumulate<unsigned char, Radix>
24 + {
25 + // Use this accumulator if number is negative
26 + static bool add(unsigned char& n, unsigned digit)
27 + {
28 + n *= Radix;
29 + if (n < digit)
30 + return false;
31 + n -= digit;
32 + return true;
33 + }
34 + };
36 template <int MaxDigits>
37 inline bool allow_more_digits(std::size_t i)
39 --- misc/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100
40 +++ misc/build/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100
41 @@ -31,6 +31,8 @@
43 #include <boost/optional/optional_fwd.hpp>
45 +#include <string.h>
47 #if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
48 // VC6.0 has the following bug:
49 // When a templated assignment operator exist, an implicit conversion
50 @@ -114,6 +116,11 @@
52 public:
54 + aligned_storage()
55 + {
56 + memset(&dummy_, 0, sizeof(dummy_));
57 + }
59 #if defined(BOOST_OPTIONAL_DETAIL_USE_ATTRIBUTE_MAY_ALIAS)
60 void const* address() const { return &dummy_; }
61 void * address() { return &dummy_; }