boost/boost.gcc47679.patch

   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 )
   6  {
   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);
  13  }
  14
  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 @@
  19              }
  20          };
  21
  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 +        };
  35 +
  36          template <int MaxDigits>
  37          inline bool allow_more_digits(std::size_t i)
  38          {
  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 @@
  42
  43  #include "boost/optional/optional_fwd.hpp"
  44
  45 +#include <string.h>
  46 +
  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 @@
  51
  52    public:
  53
  54 +    aligned_storage()
  55 +    {
  56 +      memset(&dummy_, 0, sizeof(dummy_));
  57 +    }
  58 +
  59      void const* address() const { return &dummy_.data[0]; }
  60      void      * address()       { return &dummy_.data[0]; }
  61  } ;