boost/boost.6397.warnings.patch

   1 --- misc/boost_1_44_0/boost/multi_array/collection_concept.hpp  2012-01-12 20:21:29.790009198 +0000
   2 +++ misc/build/boost_1_44_0/boost/multi_array/collection_concept.hpp    2012-01-12 20:28:55.457287835 +0000
   3 @@ -43,11 +43,11 @@
   4        i = c.end();
   5        c.swap(c);
   6      }
   7 -    void const_constraints(const Collection& c) {
   8 -      ci = c.begin();
   9 -      ci = c.end();
  10 -      n = c.size();
  11 -      b = c.empty();
  12 +    void const_constraints(const Collection& c_) {
  13 +      ci = c_.begin();
  14 +      ci = c_.end();
  15 +      n = c_.size();
  16 +      b = c_.empty();
  17      }
  18      Collection c;
  19      bool b;
  20 --- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp      2012-01-12 20:21:29.790009198 +0000
  21 +++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp        2012-01-12 20:29:56.482879277 +0000
  22 @@ -39,8 +39,8 @@
  23
  24      template <typename Array, typename IdxGen, typename Call_Type>
  25      static void call(Array& a, const IdxGen& idgen, Call_Type c) {
  26 -      typedef typename Array::index_range index_range;
  27 -      typedef typename Array::index index;
  28 +      typedef typename Array::index_range index_range_;
  29 +      typedef typename Array::index index_;
  30        idgen_helper<N-1>::call(a,idgen[c],c);
  31      }
  32    };
  33 @@ -50,8 +50,8 @@
  34
  35      template <typename Array, typename IdxGen, typename Call_Type>
  36      static void call(Array& a, const IdxGen& idgen, Call_Type) {
  37 -      typedef typename Array::index_range index_range;
  38 -      typedef typename Array::index index;
  39 +      typedef typename Array::index_range index_range_;
  40 +      typedef typename Array::index index_;
  41        a[ idgen ];
  42      }
  43    };
  44 @@ -153,27 +153,27 @@
  45        const_constraints(a);
  46      }
  47
  48 -    void const_constraints(const Array& a) {
  49 +    void const_constraints(const Array& a_) {
  50
  51        //      value_type vt = a[ id ];
  52
  53        // Test slicing, keeping only the first dimension, losing the rest
  54 -      idgen_helper<NumDims-1>::call(a,idgen[range],id);
  55 +      idgen_helper<NumDims-1>::call(a_,idgen[range],id);
  56
  57        // Test slicing, keeping all dimensions.
  58 -      idgen_helper<NumDims-1>::call(a,idgen[range],range);
  59 +      idgen_helper<NumDims-1>::call(a_,idgen[range],range);
  60
  61 -      st = a.size();
  62 -      st = a.num_dimensions();
  63 -      st = a.num_elements();
  64 -      stp = a.shape();
  65 -      idp = a.strides();
  66 -      idp = a.index_bases();
  67 -      cit = a.begin();
  68 -      cit = a.end();
  69 -      crit = a.rbegin();
  70 -      crit = a.rend();
  71 -      eltp = a.origin();
  72 +      st = a_.size();
  73 +      st = a_.num_dimensions();
  74 +      st = a_.num_elements();
  75 +      stp = a_.shape();
  76 +      idp = a_.strides();
  77 +      idp = a_.index_bases();
  78 +      cit = a_.begin();
  79 +      cit = a_.end();
  80 +      crit = a_.rbegin();
  81 +      crit = a_.rend();
  82 +      eltp = a_.origin();
  83      }
  84
  85      typedef typename Array::value_type value_type;
  86 --- misc/boost_1_44_0/boost/multi_array/extent_range.hpp        2012-01-12 20:21:29.790009198 +0000
  87 +++ misc/build/boost_1_44_0/boost/multi_array/extent_range.hpp  2012-01-12 20:32:16.696241748 +0000
  88 @@ -26,11 +26,11 @@
  89    typedef Extent index;
  90    typedef SizeType size_type;
  91
  92 -  extent_range(index start, index finish) :
  93 -    super_type(start,finish) { }
  94 +  extent_range(index start_, index finish_) :
  95 +    super_type(start_,finish_) { }
  96
  97 -  extent_range(index finish) :
  98 -    super_type(0,finish) { }
  99 +  extent_range(index finish_) :
 100 +    super_type(0,finish_) { }
 101
 102    extent_range() : super_type(0,0) { }
 103
 104 --- misc/boost_1_44_0/boost/multi_array/index_range.hpp 2012-01-12 20:21:29.790009198 +0000
 105 +++ misc/build/boost_1_44_0/boost/multi_array/index_range.hpp   2012-01-12 20:31:29.405781105 +0000
 106 @@ -60,8 +60,8 @@
 107        degenerate_ = true;
 108      }
 109
 110 -    explicit index_range(index start, index finish, index stride=1)
 111 -      : start_(start), finish_(finish), stride_(stride),
 112 +    explicit index_range(index i_start, index i_finish, index i_stride=1)
 113 +      : start_(i_start), finish_(i_finish), stride_(i_stride),
 114          degenerate_(false)
 115      { }
 116
 117 @@ -107,11 +107,11 @@
 118
 119      index stride() const { return stride_; }
 120
 121 -    void set_index_range(index start, index finish, index stride=1)
 122 +    void set_index_range(index i_start, index i_finish, index i_stride=1)
 123      {
 124 -      start_ = start;
 125 -      finish_ = finish;
 126 -      stride_ = stride;
 127 +      start_ = i_start;
 128 +      finish_ = i_finish;
 129 +      stride_ = i_stride;
 130      }
 131
 132      static index_range all()
 133 --- misc/boost_1_44_0/boost/multi_array/multi_array_ref.hpp     2012-01-12 20:21:29.790009198 +0000
 134 +++ misc/build/boost_1_44_0/boost/multi_array/multi_array_ref.hpp       2012-01-12 20:25:49.280492556 +0000
 135 @@ -124,13 +124,13 @@
 136    }
 137
 138    template <class InputIterator>
 139 -  void assign(InputIterator begin, InputIterator end) {
 140 +  void assign(InputIterator begin_, InputIterator end_) {
 141      boost::function_requires<InputIteratorConcept<InputIterator> >();
 142
 143 -    InputIterator in_iter = begin;
 144 +    InputIterator in_iter = begin_;
 145      T* out_iter = base_;
 146      std::size_t copy_count=0;
 147 -    while (in_iter != end && copy_count < num_elements_) {
 148 +    while (in_iter != end_ && copy_count < num_elements_) {
 149        *out_iter++ = *in_iter++;
 150        copy_count++;
 151      }
 152 @@ -327,15 +327,15 @@
 153    explicit
 154    const_multi_array_ref(TPtr base,
 155                          const storage_order_type& so,
 156 -                        const index * index_bases,
 157 +                        const index * index_bases_,
 158                          const size_type* extents) :
 159      base_(base), storage_(so), origin_offset_(0), directional_offset_(0)
 160   {
 161 -   // If index_bases or extents is null, then initialize the corresponding
 162 +   // If index_bases_ or extents is null, then initialize the corresponding
 163     // private data to zeroed lists.
 164 -   if(index_bases) {
 165 +   if(index_bases_) {
 166       boost::detail::multi_array::
 167 -       copy_n(index_bases,NumDims,index_base_list_.begin());
 168 +       copy_n(index_bases_,NumDims,index_base_list_.begin());
 169     } else {
 170       std::fill_n(index_base_list_.begin(),NumDims,0);
 171     }
 172 @@ -622,9 +622,9 @@
 173    // This is only supplied to support multi_array's default constructor
 174    explicit multi_array_ref(T* base,
 175                             const storage_order_type& so,
 176 -                           const index* index_bases,
 177 +                           const index* index_bases_,
 178                             const size_type* extents) :
 179 -    super_type(base,so,index_bases,extents) { }
 180 +    super_type(base,so,index_bases_,extents) { }
 181
 182  };
 183
 184 --- misc/boost_1_44_0/boost/multi_array/storage_order.hpp       2012-01-12 20:21:29.790009198 +0000
 185 +++ misc/build/boost_1_44_0/boost/multi_array/storage_order.hpp 2012-01-12 20:30:57.667472937 +0000
 186 @@ -34,10 +34,10 @@
 187    public:
 188      typedef detail::multi_array::size_type size_type;
 189      template <typename OrderingIter, typename AscendingIter>
 190 -    general_storage_order(OrderingIter ordering,
 191 -                          AscendingIter ascending) {
 192 -      boost::detail::multi_array::copy_n(ordering,NumDims,ordering_.begin());
 193 -      boost::detail::multi_array::copy_n(ascending,NumDims,ascending_.begin());
 194 +    general_storage_order(OrderingIter i_ordering,
 195 +                          AscendingIter i_ascending) {
 196 +      boost::detail::multi_array::copy_n(i_ordering,NumDims,ordering_.begin());
 197 +      boost::detail::multi_array::copy_n(i_ascending,NumDims,ascending_.begin());
 198      }
 199
 200      // RG - ideally these would not be necessary, but some compilers
 201 --- misc/boost_1_44_0/boost/multi_array/subarray.hpp    2012-01-12 20:21:29.790009198 +0000
 202 +++ misc/build/boost_1_44_0/boost/multi_array/subarray.hpp      2012-01-12 20:27:12.346292228 +0000
 203 @@ -181,9 +181,9 @@
 204
 205    const_sub_array (TPtr base,
 206                   const size_type* extents,
 207 -                 const index* strides,
 208 +                 const index* i_strides,
 209                   const index* index_base) :
 210 -    base_(base), extents_(extents), strides_(strides),
 211 +    base_(base), extents_(extents), strides_(i_strides),
 212      index_base_(index_base) {
 213    }
 214
 215 @@ -369,9 +369,9 @@
 216
 217    sub_array (T* base,
 218              const size_type* extents,
 219 -            const index* strides,
 220 +            const index* _strides,
 221              const index* index_base) :
 222 -    super_type(base,extents,strides,index_base) {
 223 +    super_type(base,extents,_strides,index_base) {
 224    }
 225
 226  };
 227 --- misc/boost_1_44_0/boost/multi_array/view.hpp        2012-01-12 20:21:29.790009198 +0000
 228 +++ misc/build/boost_1_44_0/boost/multi_array/view.hpp  2012-01-12 20:26:36.350945110 +0000
 229 @@ -231,7 +231,7 @@
 230    template <typename ExtentList, typename Index>
 231    explicit const_multi_array_view(TPtr base,
 232                             const ExtentList& extents,
 233 -                           const boost::array<Index,NumDims>& strides):
 234 +                           const boost::array<Index,NumDims>& strides_):
 235      base_(base), origin_offset_(0) {
 236
 237      index_base_list_.assign(0);
 238 @@ -240,7 +240,7 @@
 239      boost::detail::multi_array::
 240        copy_n(extents.begin(),NumDims,extent_list_.begin());
 241      boost::detail::multi_array::
 242 -      copy_n(strides.begin(),NumDims,stride_list_.begin());
 243 +      copy_n(strides_.begin(),NumDims,stride_list_.begin());
 244
 245      // Calculate the array size
 246      num_elements_ = std::accumulate(extent_list_.begin(),extent_list_.end(),
 247 @@ -441,8 +441,8 @@
 248    template <typename ExtentList, typename Index>
 249    explicit multi_array_view(T* base,
 250                              const ExtentList& extents,
 251 -                            const boost::array<Index,NumDims>& strides) :
 252 -    super_type(base,extents,strides) { }
 253 +                            const boost::array<Index,NumDims>& _strides) :
 254 +    super_type(base,extents,_strides) { }
 255
 256  };
 257