boost/boost_1_39_0.patch

   1 diff --git boost_1_39_0/boost/config/compiler/visualc.hpp boost_1_39_0/boost/config/compiler/visualc.hpp
   2 index 552e5bb..d9f90b2 100644
   3 --- misc/build/boost_1_39_0/boost/config/compiler/visualc.hpp
   4 +++ misc/build/boost_1_39_0/boost/config/compiler/visualc.hpp
   5 @@ -138,6 +138,9 @@
   6  #  define BOOST_NO_RTTI
   7  #endif
   8
   9 +// disable WORKAROUND macro - gives warning for undefined macros
  10 +#define BOOST_STRICT_CONFIG 1
  11 +
  12  //
  13  // all versions support __declspec:
  14  //
  15 diff --git boost_1_39_0/boost/function/function_base.hpp boost_1_39_0/boost/function/function_base.hpp
  16 index 6612fb8..35afa16 100644
  17 --- misc/build/boost_1_39_0/boost/function/function_base.hpp
  18 +++ misc/build/boost_1_39_0/boost/function/function_base.hpp
  19 @@ -42,7 +42,7 @@
  20  #endif
  21
  22  // Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info.
  23 -#ifdef BOOST_NO_EXCEPTION_STD_NAMESPACE
  24 +#ifdef BOOST_NO_STD_TYPEINFO
  25  // Embedded VC++ does not have type_info in namespace std
  26  #  define BOOST_FUNCTION_STD_NS
  27  #else
  28 diff --git boost_1_39_0/boost/function/function_template.hpp boost_1_39_0/boost/function/function_template.hpp
  29 index 584abe9..36b619b 100644
  30 --- misc/build/boost_1_39_0/boost/function/function_template.hpp
  31 +++ misc/build/boost_1_39_0/boost/function/function_template.hpp
  32 @@ -950,10 +950,10 @@ namespace boost {
  33            f.vtable->manager(f.functor, this->functor,
  34                              boost::detail::function::move_functor_tag);
  35                   f.vtable = 0;
  36 -#if !defined(BOOST_NO_EXCEPTIONS)
  37          } else {
  38            clear();
  39          }
  40 +#if !defined(BOOST_NO_EXCEPTIONS)
  41        } catch (...) {
  42          vtable = 0;
  43          throw;
  44 diff --git boost_1_39_0/boost/mpl/apply_wrap.hpp boost_1_39_0/boost/mpl/apply_wrap.hpp
  45 index b3cb12b..0bf8e73 100644
  46 --- misc/build/boost_1_39_0/boost/mpl/apply_wrap.hpp
  47 +++ misc/build/boost_1_39_0/boost/mpl/apply_wrap.hpp
  48 @@ -173,8 +173,8 @@ struct BOOST_PP_CAT(apply_wrap,i_)<AUX778076_APPLY_WRAP_SPEC_PARAMS(i_, int)>
  49  #   undef i_
  50
  51  ///// iteration, depth == 2
  52 -
  53 -#elif BOOST_PP_ITERATION_DEPTH() == 2
  54 +#else
  55 +#if BOOST_PP_ITERATION_DEPTH() == 2
  56
  57  #   define j_ BOOST_PP_FRAME_ITERATION(2)
  58
  59 @@ -231,4 +231,5 @@ struct BOOST_PP_CAT(apply_wrap_impl,i_)<
  60  #   undef j_
  61
  62  #endif // BOOST_PP_ITERATION_DEPTH()
  63 +#endif
  64  #endif // BOOST_PP_IS_ITERATING
  65 diff --git boost_1_39_0/boost/mpl/bind.hpp boost_1_39_0/boost/mpl/bind.hpp
  66 index 5d851ef..780e260 100644
  67 --- misc/build/boost_1_39_0/boost/mpl/bind.hpp
  68 +++ misc/build/boost_1_39_0/boost/mpl/bind.hpp
  69 @@ -531,7 +531,8 @@ struct bind_chooser<i_>
  70
  71  ///// iteration, depth == 2
  72
  73 -#elif BOOST_PP_ITERATION_DEPTH() == 2
  74 +#else
  75 +#if BOOST_PP_ITERATION_DEPTH() == 2
  76
  77  #   define j_ BOOST_PP_FRAME_ITERATION(2)
  78  #   if !defined(BOOST_MPL_CFG_NO_UNNAMED_PLACEHOLDER_SUPPORT)
  79 @@ -548,4 +549,5 @@ struct bind_chooser<i_>
  80  #   undef j_
  81
  82  #endif // BOOST_PP_ITERATION_DEPTH()
  83 +#endif
  84  #endif // BOOST_PP_IS_ITERATING
  85 diff --git boost_1_39_0/boost/ptr_container/detail/move.hpp boost_1_39_0/boost/ptr_container/detail/move.hpp
  86 index bf07d5f..6b082a7 100644
  87 --- misc/build/boost_1_39_0/boost/ptr_container/detail/move.hpp
  88 +++ misc/build/boost_1_39_0/boost/ptr_container/detail/move.hpp
  89 @@ -20,7 +20,7 @@ namespace move_ptrs {
  90  template<typename Ptr>
  91  class move_source {
  92  public:
  93 -    move_source(Ptr& ptr) : ptr_(ptr) {}
  94 +    move_source(Ptr& _ptr) : ptr_(_ptr) {}
  95      Ptr& ptr() const { return ptr_; }
  96  private:
  97      Ptr& ptr_;
  98 diff --git boost_1_39_0/boost/ptr_container/detail/reversible_ptr_container.hpp boost_1_39_0/boost/ptr_container/detail/reversible_ptr_container.hpp
  99 index 47c3903..3ad2c5c 100644
 100 --- misc/build/boost_1_39_0/boost/ptr_container/detail/reversible_ptr_container.hpp
 101 +++ misc/build/boost_1_39_0/boost/ptr_container/detail/reversible_ptr_container.hpp
 102 @@ -278,9 +278,9 @@ namespace ptr_container_detail
 103
 104      private:
 105          template< class ForwardIterator >
 106 -        ForwardIterator advance( ForwardIterator begin, size_type n )
 107 +        ForwardIterator advance( ForwardIterator _begin, size_type n )
 108          {
 109 -            ForwardIterator iter = begin;
 110 +            ForwardIterator iter = _begin;
 111              std::advance( iter, n );
 112              return iter;
 113          }
 114 diff --git boost_1_39_0/boost/ptr_container/detail/static_move_ptr.hpp boost_1_39_0/boost/ptr_container/detail/static_move_ptr.hpp
 115 index ba2b9af..9e0d682 100644
 116 --- misc/build/boost_1_39_0/boost/ptr_container/detail/static_move_ptr.hpp
 117 +++ misc/build/boost_1_39_0/boost/ptr_container/detail/static_move_ptr.hpp
 118 @@ -151,7 +151,7 @@ public:
 119      deleter_const_reference get_deleter() const { return impl_.second(); }
 120  private:
 121      template<typename TT, typename DD>
 122 -    void check(const static_move_ptr<TT, DD>& ptr)
 123 +    void check(const static_move_ptr<TT, DD>& _ptr)
 124          {
 125              typedef move_ptrs::is_smart_ptr_convertible<TT, T> convertible;
 126              BOOST_STATIC_ASSERT(convertible::value);
 127 diff --git boost_1_39_0/boost/ptr_container/exception.hpp boost_1_39_0/boost/ptr_container/exception.hpp
 128 index d9a5ffe..7837fbb 100644
 129 --- misc/build/boost_1_39_0/boost/ptr_container/exception.hpp
 130 +++ misc/build/boost_1_39_0/boost/ptr_container/exception.hpp
 131 @@ -24,7 +24,7 @@ namespace boost
 132      {
 133          const char* what_;
 134      public:
 135 -        bad_ptr_container_operation( const char* what ) : what_( what )
 136 +        bad_ptr_container_operation( const char* text ) : what_( text )
 137          { }
 138
 139          virtual const char* what() const throw()
 140 @@ -38,7 +38,7 @@ namespace boost
 141      class bad_index : public bad_ptr_container_operation
 142      {
 143      public:
 144 -        bad_index( const char* what ) : bad_ptr_container_operation( what )
 145 +        bad_index( const char* text ) : bad_ptr_container_operation( text )
 146          { }
 147      };
 148
 149 diff --git boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp
 150 index 492bf4b..565fdec 100644
 151 --- misc/build/boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp
 152 +++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp
 153 @@ -19,12 +19,12 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
 154      : len(-1), val() {}
 155
 156      template <typename T>
 157 -    inline match<T>::match(std::size_t length)
 158 -    : len(length), val() {}
 159 +    inline match<T>::match(std::size_t _length)
 160 +    : len(_length), val() {}
 161
 162      template <typename T>
 163 -    inline match<T>::match(std::size_t length, ctor_param_t val_)
 164 -    : len(length), val(val_) {}
 165 +    inline match<T>::match(std::size_t _length, ctor_param_t val_)
 166 +    : len(_length), val(val_) {}
 167
 168      template <typename T>
 169      inline bool
 170 @@ -66,11 +66,11 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
 171      inline match<nil_t>::match()
 172      : len(-1) {}
 173
 174 -    inline match<nil_t>::match(std::size_t length)
 175 -    : len(length) {}
 176 +    inline match<nil_t>::match(std::size_t _length)
 177 +    : len(_length) {}
 178
 179 -    inline match<nil_t>::match(std::size_t length, nil_t)
 180 -    : len(length) {}
 181 +    inline match<nil_t>::match(std::size_t _length, nil_t)
 182 +    : len(_length) {}
 183
 184      inline bool
 185      match<nil_t>::operator!() const
 186 diff --git boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp
 187 index ca51bd2..b2282fa 100644
 188 --- misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp
 189 +++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp
 190 @@ -226,7 +226,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
 191          template <typename ParserT, typename ScannerT, typename AttrT>
 192          struct concrete_parser : abstract_parser<ScannerT, AttrT>
 193          {
 194 -            concrete_parser(ParserT const& p) : p(p) {}
 195 +            concrete_parser(ParserT const& _p) : p(_p) {}
 196              virtual ~concrete_parser() {}
 197
 198              virtual typename match_result<ScannerT, AttrT>::type
 199 diff --git boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp
 200 index 2f4b986..b3809da 100644
 201 --- misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp
 202 +++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp
 203 @@ -106,7 +106,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
 204                  : parser_id(reinterpret_cast<std::size_t>(this));
 205          }
 206
 207 -        void set_id(parser_id id) { tag = id; }
 208 +        void set_id(parser_id _id) { tag = _id; }
 209
 210      private:
 211
 212 diff --git boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp
 213 index 73389b4..18d26cc 100644
 214 --- misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp
 215 +++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp
 216 @@ -159,11 +159,11 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
 217              return ptr.get();
 218          }
 219
 220 -        rule(abstract_parser_t* ptr)
 221 -        : ptr(ptr) {}
 222 +        rule(abstract_parser_t* _ptr)
 223 +        : ptr(_ptr) {}
 224
 225 -        rule(abstract_parser_t const* ptr)
 226 -        : ptr(ptr) {}
 227 +        rule(abstract_parser_t const* _ptr)
 228 +        : ptr(_ptr) {}
 229
 230          scoped_ptr<abstract_parser_t> ptr;
 231      };
 232 diff --git boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp
 233 index 5d6761f..b93118a 100644
 234 --- misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp
 235 +++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp
 236 @@ -210,7 +210,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
 237              subrule_list<
 238                  subrule_parser<ID2, DefT2, ContextT2>,
 239                  nil_t> >
 240 -        operator,(subrule_parser<ID2, DefT2, ContextT2> const& rhs) const
 241 +        operator,(subrule_parser<ID2, DefT2, ContextT2> const& _rhs) const
 242          {
 243              return subrule_list<
 244                  self_t,
 245 @@ -220,7 +220,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
 246                          *this,
 247                          subrule_list<
 248                              subrule_parser<ID2, DefT2, ContextT2>, nil_t>(
 249 -                                rhs, nil_t()));
 250 +                                _rhs, nil_t()));
 251          }
 252
 253          typename DefT::embed_t rhs;
 254 @@ -258,10 +258,10 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
 255          parse_main(ScannerT const& scan) const
 256          {
 257              typedef typename parser_result<self_t, ScannerT>::type result_t;
 258 -            result_t result;
 259 +            result_t _result;
 260              impl::parse_subrule<result_t, ScannerT, ID>::
 261 -                do_(result, scan);
 262 -            return result;
 263 +                do_(_result, scan);
 264 +            return _result;
 265          }
 266
 267          template <typename ScannerT>
 268 diff --git boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp
 269 index 5d75be2..730cf0c 100644
 270 --- misc/build/boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp
 271 +++ misc/build/boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp
 272 @@ -395,13 +395,13 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
 273              }
 274
 275              bool register_node(void const *r, char const *name_to_register,
 276 -                bool trace_node)
 277 +                bool _trace_node)
 278              {
 279                  if (infos.find(r) != infos.end())
 280                      return false;
 281
 282                  return infos.insert(rule_infos::value_type(r,
 283 -                    rule_info(std::string(name_to_register), trace_node))
 284 +                    rule_info(std::string(name_to_register), _trace_node))
 285                  ).second;
 286              }
 287