boost/boost.6397.warnings.patch

   1 --- misc/boost_1_44_0/boost/boost/crc.hpp
   2 +++ misc/build/boost_1_44_0/boost/boost/crc.hpp
   3 @@ -755,15 +755,15 @@ void
   4  crc_basic<Bits>::process_bits
   5  (
   6      unsigned char  bits,
   7 -    std::size_t    bit_count
   8 +    std::size_t    bit_count_
   9  )
  10  {
  11      // ignore the bits above the ones we want
  12 -    bits <<= CHAR_BIT - bit_count;
  13 +    bits <<= CHAR_BIT - bit_count_;
  14
  15      // compute the CRC for each bit, starting with the upper ones
  16      unsigned char const  high_bit_mask = 1u << ( CHAR_BIT - 1u );
  17 -    for ( std::size_t i = bit_count ; i > 0u ; --i, bits <<= 1u )
  18 +    for ( std::size_t i = bit_count_ ; i > 0u ; --i, bits <<= 1u )
  19      {
  20          process_bit( static_cast<bool>(bits & high_bit_mask) );
  21      }
  22 --- misc/boost_1_44_0/boost/multi_array/collection_concept.hpp  2012-01-12 20:21:29.790009198 +0000
  23 +++ misc/build/boost_1_44_0/boost/multi_array/collection_concept.hpp    2012-01-12 20:28:55.457287835 +0000
  24 @@ -43,11 +43,11 @@
  25        i = c.end();
  26        c.swap(c);
  27      }
  28 -    void const_constraints(const Collection& c) {
  29 -      ci = c.begin();
  30 -      ci = c.end();
  31 -      n = c.size();
  32 -      b = c.empty();
  33 +    void const_constraints(const Collection& c_) {
  34 +      ci = c_.begin();
  35 +      ci = c_.end();
  36 +      n = c_.size();
  37 +      b = c_.empty();
  38      }
  39      Collection c;
  40      bool b;
  41 --- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp      2012-01-12 20:21:29.790009198 +0000
  42 +++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp        2012-01-12 20:29:56.482879277 +0000
  43 @@ -39,8 +39,8 @@
  44
  45      template <typename Array, typename IdxGen, typename Call_Type>
  46      static void call(Array& a, const IdxGen& idgen, Call_Type c) {
  47 -      typedef typename Array::index_range index_range;
  48 -      typedef typename Array::index index;
  49 +      typedef typename Array::index_range index_range_;
  50 +      typedef typename Array::index index_;
  51        idgen_helper<N-1>::call(a,idgen[c],c);
  52      }
  53    };
  54 @@ -50,8 +50,8 @@
  55
  56      template <typename Array, typename IdxGen, typename Call_Type>
  57      static void call(Array& a, const IdxGen& idgen, Call_Type) {
  58 -      typedef typename Array::index_range index_range;
  59 -      typedef typename Array::index index;
  60 +      typedef typename Array::index_range index_range_;
  61 +      typedef typename Array::index index_;
  62        a[ idgen ];
  63      }
  64    };
  65 @@ -153,27 +153,27 @@
  66        const_constraints(a);
  67      }
  68
  69 -    void const_constraints(const Array& a) {
  70 +    void const_constraints(const Array& a_) {
  71
  72        //      value_type vt = a[ id ];
  73
  74        // Test slicing, keeping only the first dimension, losing the rest
  75 -      idgen_helper<NumDims-1>::call(a,idgen[range],id);
  76 +      idgen_helper<NumDims-1>::call(a_,idgen[range],id);
  77
  78        // Test slicing, keeping all dimensions.
  79 -      idgen_helper<NumDims-1>::call(a,idgen[range],range);
  80 +      idgen_helper<NumDims-1>::call(a_,idgen[range],range);
  81
  82 -      st = a.size();
  83 -      st = a.num_dimensions();
  84 -      st = a.num_elements();
  85 -      stp = a.shape();
  86 -      idp = a.strides();
  87 -      idp = a.index_bases();
  88 -      cit = a.begin();
  89 -      cit = a.end();
  90 -      crit = a.rbegin();
  91 -      crit = a.rend();
  92 -      eltp = a.origin();
  93 +      st = a_.size();
  94 +      st = a_.num_dimensions();
  95 +      st = a_.num_elements();
  96 +      stp = a_.shape();
  97 +      idp = a_.strides();
  98 +      idp = a_.index_bases();
  99 +      cit = a_.begin();
 100 +      cit = a_.end();
 101 +      crit = a_.rbegin();
 102 +      crit = a_.rend();
 103 +      eltp = a_.origin();
 104      }
 105
 106      typedef typename Array::value_type value_type;
 107 --- misc/boost_1_44_0/boost/multi_array/extent_range.hpp        2012-01-12 20:21:29.790009198 +0000
 108 +++ misc/build/boost_1_44_0/boost/multi_array/extent_range.hpp  2012-01-12 20:32:16.696241748 +0000
 109 @@ -26,11 +26,11 @@
 110    typedef Extent index;
 111    typedef SizeType size_type;
 112
 113 -  extent_range(index start, index finish) :
 114 -    super_type(start,finish) { }
 115 +  extent_range(index start_, index finish_) :
 116 +    super_type(start_,finish_) { }
 117
 118 -  extent_range(index finish) :
 119 -    super_type(0,finish) { }
 120 +  extent_range(index finish_) :
 121 +    super_type(0,finish_) { }
 122
 123    extent_range() : super_type(0,0) { }
 124
 125 --- misc/boost_1_44_0/boost/multi_array/index_range.hpp 2012-01-12 20:21:29.790009198 +0000
 126 +++ misc/build/boost_1_44_0/boost/multi_array/index_range.hpp   2012-01-12 20:31:29.405781105 +0000
 127 @@ -60,8 +60,8 @@
 128        degenerate_ = true;
 129      }
 130
 131 -    explicit index_range(index start, index finish, index stride=1)
 132 -      : start_(start), finish_(finish), stride_(stride),
 133 +    explicit index_range(index i_start, index i_finish, index i_stride=1)
 134 +      : start_(i_start), finish_(i_finish), stride_(i_stride),
 135          degenerate_(false)
 136      { }
 137
 138 @@ -107,11 +107,11 @@
 139
 140      index stride() const { return stride_; }
 141
 142 -    void set_index_range(index start, index finish, index stride=1)
 143 +    void set_index_range(index i_start, index i_finish, index i_stride=1)
 144      {
 145 -      start_ = start;
 146 -      finish_ = finish;
 147 -      stride_ = stride;
 148 +      start_ = i_start;
 149 +      finish_ = i_finish;
 150 +      stride_ = i_stride;
 151      }
 152
 153      static index_range all()
 154 --- misc/boost_1_44_0/boost/multi_array/multi_array_ref.hpp     2012-01-12 20:21:29.790009198 +0000
 155 +++ misc/build/boost_1_44_0/boost/multi_array/multi_array_ref.hpp       2012-01-12 20:25:49.280492556 +0000
 156 @@ -124,13 +124,13 @@
 157    }
 158
 159    template <class InputIterator>
 160 -  void assign(InputIterator begin, InputIterator end) {
 161 +  void assign(InputIterator begin_, InputIterator end_) {
 162      boost::function_requires<InputIteratorConcept<InputIterator> >();
 163
 164 -    InputIterator in_iter = begin;
 165 +    InputIterator in_iter = begin_;
 166      T* out_iter = base_;
 167      std::size_t copy_count=0;
 168 -    while (in_iter != end && copy_count < num_elements_) {
 169 +    while (in_iter != end_ && copy_count < num_elements_) {
 170        *out_iter++ = *in_iter++;
 171        copy_count++;
 172      }
 173 @@ -327,15 +327,15 @@
 174    explicit
 175    const_multi_array_ref(TPtr base,
 176                          const storage_order_type& so,
 177 -                        const index * index_bases,
 178 +                        const index * index_bases_,
 179                          const size_type* extents) :
 180      base_(base), storage_(so), origin_offset_(0), directional_offset_(0)
 181   {
 182 -   // If index_bases or extents is null, then initialize the corresponding
 183 +   // If index_bases_ or extents is null, then initialize the corresponding
 184     // private data to zeroed lists.
 185 -   if(index_bases) {
 186 +   if(index_bases_) {
 187       boost::detail::multi_array::
 188 -       copy_n(index_bases,NumDims,index_base_list_.begin());
 189 +       copy_n(index_bases_,NumDims,index_base_list_.begin());
 190     } else {
 191       std::fill_n(index_base_list_.begin(),NumDims,0);
 192     }
 193 @@ -597,9 +597,9 @@
 194  #endif // BOOST_MSVC
 195    typename const_array_view<NDims>::type
 196    operator[](const detail::multi_array::
 197 -             index_gen<NumDims,NDims>& indices)
 198 +             index_gen<NumDims,NDims>& indices_)
 199      const {
 200 -    return super_type::operator[](indices);
 201 +    return super_type::operator[](indices_);
 202    }
 203
 204    const_iterator begin() const {
 205 @@ -622,9 +622,9 @@
 206    // This is only supplied to support multi_array's default constructor
 207    explicit multi_array_ref(T* base,
 208                             const storage_order_type& so,
 209 -                           const index* index_bases,
 210 -                           const size_type* extents) :
 211 -    super_type(base,so,index_bases,extents) { }
 212 +                           const index* index_bases_,
 213 +                           const size_type* extents_) :
 214 +    super_type(base,so,index_bases_,extents_) { }
 215
 216  };
 217
 218 --- misc/boost_1_44_0/boost/multi_array/storage_order.hpp       2012-01-12 20:21:29.790009198 +0000
 219 +++ misc/build/boost_1_44_0/boost/multi_array/storage_order.hpp 2012-01-12 20:30:57.667472937 +0000
 220 @@ -34,10 +34,10 @@
 221    public:
 222      typedef detail::multi_array::size_type size_type;
 223      template <typename OrderingIter, typename AscendingIter>
 224 -    general_storage_order(OrderingIter ordering,
 225 -                          AscendingIter ascending) {
 226 -      boost::detail::multi_array::copy_n(ordering,NumDims,ordering_.begin());
 227 -      boost::detail::multi_array::copy_n(ascending,NumDims,ascending_.begin());
 228 +    general_storage_order(OrderingIter i_ordering,
 229 +                          AscendingIter i_ascending) {
 230 +      boost::detail::multi_array::copy_n(i_ordering,NumDims,ordering_.begin());
 231 +      boost::detail::multi_array::copy_n(i_ascending,NumDims,ascending_.begin());
 232      }
 233
 234      // RG - ideally these would not be necessary, but some compilers
 235 --- misc/boost_1_44_0/boost/multi_array/subarray.hpp    2012-01-12 20:21:29.790009198 +0000
 236 +++ misc/build/boost_1_44_0/boost/multi_array/subarray.hpp      2012-01-12 20:27:12.346292228 +0000
 237 @@ -181,9 +181,9 @@
 238
 239    const_sub_array (TPtr base,
 240                   const size_type* extents,
 241 -                 const index* strides,
 242 +                 const index* i_strides,
 243                   const index* index_base) :
 244 -    base_(base), extents_(extents), strides_(strides),
 245 +    base_(base), extents_(extents), strides_(i_strides),
 246      index_base_(index_base) {
 247    }
 248
 249 @@ -369,9 +369,9 @@
 250
 251    sub_array (T* base,
 252              const size_type* extents,
 253 -            const index* strides,
 254 +            const index* _strides,
 255              const index* index_base) :
 256 -    super_type(base,extents,strides,index_base) {
 257 +    super_type(base,extents,_strides,index_base) {
 258    }
 259
 260  };
 261 --- misc/boost_1_44_0/boost/multi_array/view.hpp        2012-01-12 20:21:29.790009198 +0000
 262 +++ misc/build/boost_1_44_0/boost/multi_array/view.hpp  2012-01-12 20:26:36.350945110 +0000
 263 @@ -231,7 +231,7 @@
 264    template <typename ExtentList, typename Index>
 265    explicit const_multi_array_view(TPtr base,
 266                             const ExtentList& extents,
 267 -                           const boost::array<Index,NumDims>& strides):
 268 +                           const boost::array<Index,NumDims>& strides_):
 269      base_(base), origin_offset_(0) {
 270
 271      index_base_list_.assign(0);
 272 @@ -240,7 +240,7 @@
 273      boost::detail::multi_array::
 274        copy_n(extents.begin(),NumDims,extent_list_.begin());
 275      boost::detail::multi_array::
 276 -      copy_n(strides.begin(),NumDims,stride_list_.begin());
 277 +      copy_n(strides_.begin(),NumDims,stride_list_.begin());
 278
 279      // Calculate the array size
 280      num_elements_ = std::accumulate(extent_list_.begin(),extent_list_.end(),
 281 @@ -441,8 +441,8 @@
 282    template <typename ExtentList, typename Index>
 283    explicit multi_array_view(T* base,
 284                              const ExtentList& extents,
 285 -                            const boost::array<Index,NumDims>& strides) :
 286 -    super_type(base,extents,strides) { }
 287 +                            const boost::array<Index,NumDims>& _strides) :
 288 +    super_type(base,extents,_strides) { }
 289
 290  };
 291
 292 --- misc/boost_1_44_0/boost/multi_array.hpp     2012-09-28 13:06:44.796521371 +0100
 293 +++ misc/build/boost_1_44_0/boost/multi_array.hpp       2012-09-28 13:07:25.119002500 +0100
 294 @@ -139,20 +139,20 @@
 295
 296    explicit multi_array() :
 297      super_type((T*)initial_base_,c_storage_order(),
 298 -               /*index_bases=*/0, /*extents=*/0) {
 299 +               /*index_bases=*/0, /*extents_=*/0) {
 300      allocate_space();
 301    }
 302
 303    template <class ExtentList>
 304    explicit multi_array(
 305 -      ExtentList const& extents
 306 +      ExtentList const& extents_
 307  #ifdef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
 308        , typename mpl::if_<
 309        detail::multi_array::is_multi_array_impl<ExtentList>,
 310        int&,int>::type* = 0
 311  #endif
 312        ) :
 313 -    super_type((T*)initial_base_,extents) {
 314 +    super_type((T*)initial_base_,extents_) {
 315      boost::function_requires<
 316        detail::multi_array::CollectionConcept<ExtentList> >();
 317      allocate_space();
 318 @@ -160,19 +160,19 @@
 319
 320
 321    template <class ExtentList>
 322 -  explicit multi_array(ExtentList const& extents,
 323 +  explicit multi_array(ExtentList const& extents_,
 324                         const general_storage_order<NumDims>& so) :
 325 -    super_type((T*)initial_base_,extents,so) {
 326 +    super_type((T*)initial_base_,extents_,so) {
 327      boost::function_requires<
 328        detail::multi_array::CollectionConcept<ExtentList> >();
 329      allocate_space();
 330    }
 331
 332    template <class ExtentList>
 333 -  explicit multi_array(ExtentList const& extents,
 334 +  explicit multi_array(ExtentList const& extents_,
 335                         const general_storage_order<NumDims>& so,
 336                         Allocator const& alloc) :
 337 -    super_type((T*)initial_base_,extents,so), allocator_(alloc) {
 338 +    super_type((T*)initial_base_,extents_,so), allocator_(alloc) {
 339      boost::function_requires<
 340        detail::multi_array::CollectionConcept<ExtentList> >();
 341      allocate_space();
 342 @@ -381,7 +381,7 @@
 343
 344
 345    template <typename ExtentList>
 346 -  multi_array& resize(const ExtentList& extents) {
 347 +  multi_array& resize(const ExtentList& extents_) {
 348      boost::function_requires<
 349        detail::multi_array::CollectionConcept<ExtentList> >();
 350
 351 @@ -390,7 +390,7 @@
 352
 353      for (int i=0; i != NumDims; ++i) {
 354        typedef typename gen_type::range range_type;
 355 -      ranges.ranges_[i] = range_type(0,extents[i]);
 356 +      ranges.ranges_[i] = range_type(0,extents_[i]);
 357      }
 358
 359      return this->resize(ranges);
 360 @@ -423,9 +423,9 @@
 361      // Build index_gen objects to create views with the same shape
 362
 363      // these need to be separate to handle non-zero index bases
 364 -    typedef detail::multi_array::index_gen<NumDims,NumDims> index_gen;
 365 -    index_gen old_idxes;
 366 -    index_gen new_idxes;
 367 +    typedef detail::multi_array::index_gen<NumDims,NumDims> lcl_index_gen;
 368 +    lcl_index_gen old_idxes;
 369 +    lcl_index_gen new_idxes;
 370
 371      std::transform(new_array.index_base_list_.begin(),
 372                     new_array.index_base_list_.end(),
 373 --- misc/boost_1_44_0/boost/random/mersenne_twister.hpp
 374 +++ misc/build/boost_1_44_0/boost/random/mersenne_twister.hpp
 375 @@ -195,16 +195,16 @@
 376    }
 377  #endif
 378
 379 -  friend bool operator==(const mersenne_twister& x, const mersenne_twister& y)
 380 +  friend bool operator==(const mersenne_twister& x_, const mersenne_twister& y_)
 381    {
 382      for(int j = 0; j < state_size; ++j)
 383 -      if(x.compute(j) != y.compute(j))
 384 +      if(x_.compute(j) != y_.compute(j))
 385          return false;
 386      return true;
 387    }
 388
 389 -  friend bool operator!=(const mersenne_twister& x, const mersenne_twister& y)
 390 -  { return !(x == y); }
 391 +  friend bool operator!=(const mersenne_twister& x_, const mersenne_twister& y_)
 392 +  { return !(x_ == y_); }
 393  #else
 394    // Use a member function; Streamable concept not supported.
 395    bool operator==(const mersenne_twister& rhs) const
 396 --- misc/boost_1_44_0/boost/uuid/uuid_io.hpp
 397 +++ misc/build/boost_1_44_0/boost/uuid/uuid_io.hpp
 398 @@ -59,7 +59,7 @@
 399          }
 400
 401          if (flags & std::ios_base::left) {
 402 -            for (std::streamsize i=uuid_width; i<width; i++) {
 403 +            for (std::streamsize s=uuid_width; s<width; ++s) {
 404                  os << fill;
 405              }
 406          }
 407 --- misc/boost_1_44_0/boost/uuid/name_generator.hpp
 408 +++ misc/build/boost_1_44_0/boost/uuid/name_generator.hpp
 409 @@ -30,8 +30,8 @@
 410  public:
 411      typedef uuid result_type;
 412
 413 -    explicit name_generator(uuid const& namespace_uuid)
 414 -        : namespace_uuid(namespace_uuid)
 415 +    explicit name_generator(uuid const& namespace_uuid_)
 416 +        : namespace_uuid(namespace_uuid_)
 417      {}
 418
 419      uuid operator()(const char* name) {