Ticket #6397: boost.xxxx.warnings.patch
File boost.xxxx.warnings.patch, 8.2 KB (added by , 11 years ago) |
---|
-
boost_1_44_0/boost/multi_array/collection_concept.hpp
old new 43 43 i = c.end(); 44 44 c.swap(c); 45 45 } 46 void const_constraints(const Collection& c ) {47 ci = c .begin();48 ci = c .end();49 n = c .size();50 b = c .empty();46 void const_constraints(const Collection& c_) { 47 ci = c_.begin(); 48 ci = c_.end(); 49 n = c_.size(); 50 b = c_.empty(); 51 51 } 52 52 Collection c; 53 53 bool b; -
boost_1_44_0/boost/multi_array/concept_checks.hpp
old new 39 39 40 40 template <typename Array, typename IdxGen, typename Call_Type> 41 41 static void call(Array& a, const IdxGen& idgen, Call_Type c) { 42 typedef typename Array::index_range index_range ;43 typedef typename Array::index index ;42 typedef typename Array::index_range index_range_; 43 typedef typename Array::index index_; 44 44 idgen_helper<N-1>::call(a,idgen[c],c); 45 45 } 46 46 }; … … 50 50 51 51 template <typename Array, typename IdxGen, typename Call_Type> 52 52 static void call(Array& a, const IdxGen& idgen, Call_Type) { 53 typedef typename Array::index_range index_range ;54 typedef typename Array::index index ;53 typedef typename Array::index_range index_range_; 54 typedef typename Array::index index_; 55 55 a[ idgen ]; 56 56 } 57 57 }; … … 153 153 const_constraints(a); 154 154 } 155 155 156 void const_constraints(const Array& a ) {156 void const_constraints(const Array& a_) { 157 157 158 158 // value_type vt = a[ id ]; 159 159 160 160 // Test slicing, keeping only the first dimension, losing the rest 161 idgen_helper<NumDims-1>::call(a ,idgen[range],id);161 idgen_helper<NumDims-1>::call(a_,idgen[range],id); 162 162 163 163 // Test slicing, keeping all dimensions. 164 idgen_helper<NumDims-1>::call(a ,idgen[range],range);164 idgen_helper<NumDims-1>::call(a_,idgen[range],range); 165 165 166 st = a .size();167 st = a .num_dimensions();168 st = a .num_elements();169 stp = a .shape();170 idp = a .strides();171 idp = a .index_bases();172 cit = a .begin();173 cit = a .end();174 crit = a .rbegin();175 crit = a .rend();176 eltp = a .origin();166 st = a_.size(); 167 st = a_.num_dimensions(); 168 st = a_.num_elements(); 169 stp = a_.shape(); 170 idp = a_.strides(); 171 idp = a_.index_bases(); 172 cit = a_.begin(); 173 cit = a_.end(); 174 crit = a_.rbegin(); 175 crit = a_.rend(); 176 eltp = a_.origin(); 177 177 } 178 178 179 179 typedef typename Array::value_type value_type; -
boost_1_44_0/boost/multi_array/extent_range.hpp
old new 26 26 typedef Extent index; 27 27 typedef SizeType size_type; 28 28 29 extent_range(index start , index finish) :30 super_type(start ,finish) { }29 extent_range(index start_, index finish_) : 30 super_type(start_,finish_) { } 31 31 32 extent_range(index finish ) :33 super_type(0,finish ) { }32 extent_range(index finish_) : 33 super_type(0,finish_) { } 34 34 35 35 extent_range() : super_type(0,0) { } 36 36 -
boost_1_44_0/boost/multi_array/index_range.hpp
old new 60 60 degenerate_ = true; 61 61 } 62 62 63 explicit index_range(index start, index finish, indexstride=1)64 : start_( start), finish_(finish), stride_(stride),63 explicit index_range(index i_start, index i_finish, index i_stride=1) 64 : start_(i_start), finish_(i_finish), stride_(i_stride), 65 65 degenerate_(false) 66 66 { } 67 67 … … 107 107 108 108 index stride() const { return stride_; } 109 109 110 void set_index_range(index start, index finish, indexstride=1)110 void set_index_range(index i_start, index i_finish, index i_stride=1) 111 111 { 112 start_ = start;113 finish_ = finish;114 stride_ = stride;112 start_ = i_start; 113 finish_ = i_finish; 114 stride_ = i_stride; 115 115 } 116 116 117 117 static index_range all() -
boost_1_44_0/boost/multi_array/multi_array_ref.hpp
old new 124 124 } 125 125 126 126 template <class InputIterator> 127 void assign(InputIterator begin , InputIterator end) {127 void assign(InputIterator begin_, InputIterator end_) { 128 128 boost::function_requires<InputIteratorConcept<InputIterator> >(); 129 129 130 InputIterator in_iter = begin ;130 InputIterator in_iter = begin_; 131 131 T* out_iter = base_; 132 132 std::size_t copy_count=0; 133 while (in_iter != end && copy_count < num_elements_) {133 while (in_iter != end_ && copy_count < num_elements_) { 134 134 *out_iter++ = *in_iter++; 135 135 copy_count++; 136 136 } … … 327 327 explicit 328 328 const_multi_array_ref(TPtr base, 329 329 const storage_order_type& so, 330 const index * index_bases ,330 const index * index_bases_, 331 331 const size_type* extents) : 332 332 base_(base), storage_(so), origin_offset_(0), directional_offset_(0) 333 333 { 334 // If index_bases or extents is null, then initialize the corresponding334 // If index_bases_ or extents is null, then initialize the corresponding 335 335 // private data to zeroed lists. 336 if(index_bases ) {336 if(index_bases_) { 337 337 boost::detail::multi_array:: 338 copy_n(index_bases ,NumDims,index_base_list_.begin());338 copy_n(index_bases_,NumDims,index_base_list_.begin()); 339 339 } else { 340 340 std::fill_n(index_base_list_.begin(),NumDims,0); 341 341 } -
boost_1_44_0/boost/multi_array/storage_order.hpp
old new 34 34 public: 35 35 typedef detail::multi_array::size_type size_type; 36 36 template <typename OrderingIter, typename AscendingIter> 37 general_storage_order(OrderingIter ordering,38 AscendingIter ascending) {39 boost::detail::multi_array::copy_n( ordering,NumDims,ordering_.begin());40 boost::detail::multi_array::copy_n( ascending,NumDims,ascending_.begin());37 general_storage_order(OrderingIter i_ordering, 38 AscendingIter i_ascending) { 39 boost::detail::multi_array::copy_n(i_ordering,NumDims,ordering_.begin()); 40 boost::detail::multi_array::copy_n(i_ascending,NumDims,ascending_.begin()); 41 41 } 42 42 43 43 // RG - ideally these would not be necessary, but some compilers -
boost_1_44_0/boost/multi_array/subarray.hpp
old new 181 181 182 182 const_sub_array (TPtr base, 183 183 const size_type* extents, 184 const index* strides,184 const index* i_strides, 185 185 const index* index_base) : 186 base_(base), extents_(extents), strides_( strides),186 base_(base), extents_(extents), strides_(i_strides), 187 187 index_base_(index_base) { 188 188 } 189 189 -
boost_1_44_0/boost/multi_array/view.hpp
old new 231 231 template <typename ExtentList, typename Index> 232 232 explicit const_multi_array_view(TPtr base, 233 233 const ExtentList& extents, 234 const boost::array<Index,NumDims>& strides ):234 const boost::array<Index,NumDims>& strides_): 235 235 base_(base), origin_offset_(0) { 236 236 237 237 index_base_list_.assign(0); … … 240 240 boost::detail::multi_array:: 241 241 copy_n(extents.begin(),NumDims,extent_list_.begin()); 242 242 boost::detail::multi_array:: 243 copy_n(strides .begin(),NumDims,stride_list_.begin());243 copy_n(strides_.begin(),NumDims,stride_list_.begin()); 244 244 245 245 // Calculate the array size 246 246 num_elements_ = std::accumulate(extent_list_.begin(),extent_list_.end(),