boost/boost_1_39_0.patch

   1 --- misc/boost_1_39_0/boost/function/function_template.hpp      2008-10-16 15:21:50.000000000 +0200
   2 +++ misc/build/boost_1_39_0/boost/function/function_template.hpp        2009-07-09 12:58:51.141224220 +0200
   3 @@ -950,10 +950,10 @@
   4            f.vtable->manager(f.functor, this->functor,
   5                              boost::detail::function::move_functor_tag);
   6                   f.vtable = 0;
   7 -#if !defined(BOOST_NO_EXCEPTIONS)
   8          } else {
   9            clear();
  10          }
  11 +#if !defined(BOOST_NO_EXCEPTIONS)
  12        } catch (...) {
  13          vtable = 0;
  14          throw;
  15 --- misc/boost_1_39_0/boost/function/function_base.hpp  2008-10-16 15:21:50.000000000 +0200
  16 +++ misc/build/boost_1_39_0/boost/function/function_base.hpp    2009-07-12 21:42:22.779873909 +0200
  17 @@ -42,7 +42,7 @@
  18  #endif
  19
  20  // Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info.
  21 -#ifdef BOOST_NO_EXCEPTION_STD_NAMESPACE
  22 +#ifdef BOOST_NO_STD_TYPEINFO
  23  // Embedded VC++ does not have type_info in namespace std
  24  #  define BOOST_FUNCTION_STD_NS
  25  #else
  26 --- misc/boost_1_39_0/boost/config/compiler/visualc.hpp 2009-03-26 20:00:00.000000000 +0100
  27 +++ misc/build/boost_1_39_0/boost/config/compiler/visualc.hpp   2009-06-10 21:53:42.484375000 +0200
  28 @@ -138,6 +138,9 @@
  29  #  define BOOST_NO_RTTI
  30  #endif
  31
  32 +// disable WORKAROUND macro - gives warning for undefined macros
  33 +#define BOOST_STRICT_CONFIG 1
  34 +
  35  //
  36  // all versions support __declspec:
  37  //
  38 --- misc/boost_1_39_0/boost/mpl/apply_wrap.hpp  2008-10-11 08:50:46.000000000 +0200
  39 +++ misc/build/boost_1_39_0/boost/mpl/apply_wrap.hpp    2009-06-10 21:53:42.500000000 +0200
  40 @@ -173,8 +173,8 @@
  41  #   undef i_
  42
  43  ///// iteration, depth == 2
  44 -
  45 -#elif BOOST_PP_ITERATION_DEPTH() == 2
  46 +#else
  47 +#if BOOST_PP_ITERATION_DEPTH() == 2
  48
  49  #   define j_ BOOST_PP_FRAME_ITERATION(2)
  50
  51 @@ -230,4 +231,5 @@
  52  #   undef j_
  53
  54  #endif // BOOST_PP_ITERATION_DEPTH()
  55 +#endif
  56  #endif // BOOST_PP_IS_ITERATING
  57 --- misc/boost_1_39_0/boost/mpl/bind.hpp        2008-10-11 08:19:02.000000000 +0200
  58 +++ misc/build/boost_1_39_0/boost/mpl/bind.hpp  2009-06-10 21:53:42.515625000 +0200
  59 @@ -531,7 +531,8 @@
  60
  61  ///// iteration, depth == 2
  62
  63 -#elif BOOST_PP_ITERATION_DEPTH() == 2
  64 +#else
  65 +#if BOOST_PP_ITERATION_DEPTH() == 2
  66
  67  #   define j_ BOOST_PP_FRAME_ITERATION(2)
  68  #   if !defined(BOOST_MPL_CFG_NO_UNNAMED_PLACEHOLDER_SUPPORT)
  69 @@ -548,4 +549,5 @@
  70  #   undef j_
  71
  72  #endif // BOOST_PP_ITERATION_DEPTH()
  73 +#endif
  74  #endif // BOOST_PP_IS_ITERATING
  75 --- misc/boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp     2008-06-22 17:05:38.000000000 +0200
  76 +++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp       2009-06-10 21:53:42.531250000 +0200
  77 @@ -19,12 +19,12 @@
  78      : len(-1), val() {}
  79
  80      template <typename T>
  81 -    inline match<T>::match(std::size_t length)
  82 -    : len(length), val() {}
  83 +    inline match<T>::match(std::size_t _length)
  84 +    : len(_length), val() {}
  85
  86      template <typename T>
  87 -    inline match<T>::match(std::size_t length, ctor_param_t val_)
  88 -    : len(length), val(val_) {}
  89 +    inline match<T>::match(std::size_t _length, ctor_param_t val_)
  90 +    : len(_length), val(val_) {}
  91
  92      template <typename T>
  93      inline bool
  94 @@ -66,11 +66,11 @@
  95      inline match<nil_t>::match()
  96      : len(-1) {}
  97
  98 -    inline match<nil_t>::match(std::size_t length)
  99 -    : len(length) {}
 100 +    inline match<nil_t>::match(std::size_t _length)
 101 +    : len(_length) {}
 102
 103 -    inline match<nil_t>::match(std::size_t length, nil_t)
 104 -    : len(length) {}
 105 +    inline match<nil_t>::match(std::size_t _length, nil_t)
 106 +    : len(_length) {}
 107
 108      inline bool
 109      match<nil_t>::operator!() const
 110 --- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp 2008-06-22 17:05:38.000000000 +0200
 111 +++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp   2009-06-10 21:53:42.546875000 +0200
 112 @@ -226,7 +226,7 @@
 113          template <typename ParserT, typename ScannerT, typename AttrT>
 114          struct concrete_parser : abstract_parser<ScannerT, AttrT>
 115          {
 116 -            concrete_parser(ParserT const& p) : p(p) {}
 117 +            concrete_parser(ParserT const& _p) : p(_p) {}
 118              virtual ~concrete_parser() {}
 119
 120              virtual typename match_result<ScannerT, AttrT>::type
 121 --- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp 2008-06-22 17:05:38.000000000 +0200
 122 +++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp   2009-06-10 21:53:42.562500000 +0200
 123 @@ -106,7 +106,7 @@
 124                  : parser_id(reinterpret_cast<std::size_t>(this));
 125          }
 126
 127 -        void set_id(parser_id id) { tag = id; }
 128 +        void set_id(parser_id _id) { tag = _id; }
 129
 130      private:
 131
 132 --- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp      2008-06-22 17:05:38.000000000 +0200
 133 +++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp        2009-07-08 22:23:45.899895415 +0200
 134 @@ -159,11 +159,11 @@
 135              return ptr.get();
 136          }
 137
 138 -        rule(abstract_parser_t* ptr)
 139 -        : ptr(ptr) {}
 140 +        rule(abstract_parser_t* _ptr)
 141 +        : ptr(_ptr) {}
 142
 143 -        rule(abstract_parser_t const* ptr)
 144 -        : ptr(ptr) {}
 145 +        rule(abstract_parser_t const* _ptr)
 146 +        : ptr(_ptr) {}
 147
 148          scoped_ptr<abstract_parser_t> ptr;
 149      };
 150 --- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp   2008-06-22 17:05:38.000000000 +0200
 151 +++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp     2009-06-10 21:53:42.593750000 +0200
 152 @@ -210,7 +210,7 @@
 153              subrule_list<
 154                  subrule_parser<ID2, DefT2, ContextT2>,
 155                  nil_t> >
 156 -        operator,(subrule_parser<ID2, DefT2, ContextT2> const& rhs) const
 157 +        operator,(subrule_parser<ID2, DefT2, ContextT2> const& _rhs) const
 158          {
 159              return subrule_list<
 160                  self_t,
 161 @@ -220,7 +220,7 @@
 162                          *this,
 163                          subrule_list<
 164                              subrule_parser<ID2, DefT2, ContextT2>, nil_t>(
 165 -                                rhs, nil_t()));
 166 +                                _rhs, nil_t()));
 167          }
 168
 169          typename DefT::embed_t rhs;
 170 @@ -258,10 +258,10 @@
 171          parse_main(ScannerT const& scan) const
 172          {
 173              typedef typename parser_result<self_t, ScannerT>::type result_t;
 174 -            result_t result;
 175 +            result_t _result;
 176              impl::parse_subrule<result_t, ScannerT, ID>::
 177 -                do_(result, scan);
 178 -            return result;
 179 +                do_(_result, scan);
 180 +            return _result;
 181          }
 182
 183          template <typename ScannerT>