boost/multi_array
2
0
Fork 0
mirror of https://github.com/boostorg/multi_array.git synced 2026-02-02 09:02:09 +00:00
Code Issues Projects Releases Wiki Activity

Made some changes as per bug reports regarding calls to dependent base classes.

Browse Source 
[SVN r16932]
This commit is contained in:
Ronald Garcia
2003-01-18 19:47:29 +00:00
parent 080c2a7c9b
commit ef89b81e7c
3 changed files with 64 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
include/boost/multi_array/multi_array_ref.hpp
View File

@@ -149,7 +149,7 @@ public:
void reindex(index value) {
index_base_list_.assign(value);
origin_offset_ =
super_type::calculate_origin_offset(stride_list_,extent_list_,
calculate_origin_offset(stride_list_,extent_list_,
storage_,index_base_list_);
}
@@ -368,13 +368,13 @@ private:
1,std::multiplies<index>());
assert(num_elements_ != 0);
compute_strides(stride_list_,extent_list_,storage_);
this->compute_strides(stride_list_,extent_list_,storage_);
origin_offset_ =
calculate_origin_offset(stride_list_,extent_list_,
this->calculate_origin_offset(stride_list_,extent_list_,
storage_,index_base_list_);
directional_offset_ =
calculate_descending_dimension_offset(stride_list_,extent_list_,
this->calculate_descending_dimension_offset(stride_list_,extent_list_,
storage_);
}
};
@@ -455,11 +455,11 @@ public:
ConstMultiArrayConcept<ConstMultiArray,NumDims> >();
// make sure the dimensions agree
assert(other.num_dimensions() == num_dimensions());
assert(std::equal(other.shape(),other.shape()+num_dimensions(),
shape()));
assert(other.num_dimensions() == this->num_dimensions());
assert(std::equal(other.shape(),other.shape()+this->num_dimensions(),
this->shape()));
// iterator-based copy
std::copy(other.begin(),other.end(),begin());
std::copy(other.begin(),other.end(),this->begin());
return *this;
}
@@ -467,11 +467,11 @@ public:
if (&other != this) {
// make sure the dimensions agree
assert(other.num_dimensions() == super_type::num_dimensions());
assert(std::equal(other.shape(),other.shape()+super_type::num_dimensions(),
super_type::shape()));
assert(other.num_dimensions() == this->num_dimensions());
assert(std::equal(other.shape(),other.shape()+this->num_dimensions(),
this->shape()));
// iterator-based copy
std::copy(other.begin(),other.end(),begin());
std::copy(other.begin(),other.end(),this->begin());
}
return *this;
}
@@ -486,15 +486,15 @@ public:
detail::multi_array::CollectionConcept<IndexList> >();
return super_type::access_element(boost::type<element&>(),
origin(),
indices,strides());
indices,this->strides());
}
reference operator[](index idx) {
return super_type::access(boost::type<reference>(),
idx,origin(),
super_type::shape(),super_type::strides(),
super_type::index_bases());
this->shape(),this->strides(),
this->index_bases());
}
@@ -511,21 +511,22 @@ public:
return
super_type::generate_array_view(boost::type<return_type>(),
indices,
shape(),
strides(),
index_bases(),
this->shape(),
this->strides(),
this->index_bases(),
origin());
}
iterator begin() {
return iterator(iter_base(*super_type::index_bases(),origin(),super_type::shape(),
super_type::strides(),super_type::index_bases()));
return iterator(iter_base(*this->index_bases(),origin(),this->shape(),
this->strides(),this->index_bases()));
}
iterator end() {
return iterator(iter_base(*super_type::index_bases()+*super_type::shape(),origin(),
super_type::shape(),super_type::strides(),super_type::index_bases()));
return iterator(iter_base(*this->index_bases()+*this->shape(),origin(),
this->shape(),this->strides(),
this->index_bases()));
}
// RG - rbegin() and rend() written naively to thwart MSVC ICE.
@@ -555,7 +556,8 @@ public:
const_reference operator[](index idx) const {
return super_type::access(boost::type<const_reference>(),
idx,origin(),
super_type::shape(),super_type::strides(),super_type::index_bases());
this->shape(),this->strides(),
this->index_bases());
}
// See note attached to generate_array_view in base.hpp

35
include/boost/multi_array/subarray.hpp
View File

@@ -235,9 +235,9 @@ public:
ConstMultiArray, NumDims> >();
// make sure the dimensions agree
assert(other.num_dimensions() == num_dimensions());
assert(std::equal(other.shape(),other.shape()+num_dimensions(),
shape()));
assert(other.num_dimensions() == this->num_dimensions());
assert(std::equal(other.shape(),other.shape()+this->num_dimensions(),
this->shape()));
// iterator-based copy
std::copy(other.begin(),other.end(),begin());
return *this;
@@ -247,21 +247,22 @@ public:
sub_array& operator=(const sub_array& other) {
if (&other != this) {
// make sure the dimensions agree
assert(other.num_dimensions() == super_type::num_dimensions());
assert(std::equal(other.shape(),other.shape()+super_type::num_dimensions(),
super_type::shape()));
assert(other.num_dimensions() == this->num_dimensions());
assert(std::equal(other.shape(),other.shape()+this->num_dimensions(),
this->shape()));
// iterator-based copy
std::copy(other.begin(),other.end(),begin());
}
return *this;
}
T* origin() { return super_type::base_; }
const T* origin() const { return super_type::base_; }
T* origin() { return this->base_; }
const T* origin() const { return this->base_; }
reference operator[](index idx) {
return super_type::access(boost::type<reference>(),
idx,super_type::base_,super_type::shape(),super_type::strides(),super_type::index_bases());
idx,this->base_,this->shape(),this->strides(),
this->index_bases());
}
// see generate_array_view in base.hpp
@@ -277,9 +278,9 @@ public:
return
super_type::generate_array_view(boost::type<return_type>(),
indices,
shape(),
strides(),
index_bases(),
this->shape(),
this->strides(),
this->index_bases(),
origin());
}
@@ -287,17 +288,17 @@ public:
element& operator()(const IndexList& indices) {
return super_type::access_element(boost::type<element&>(),
origin(),
indices,strides());
indices,this->strides());
}
iterator begin() {
return iterator(iter_base(*super_type::index_bases(),origin(),
super_type::shape(),super_type::strides(),super_type::index_bases()));
return iterator(iter_base(*this->index_bases(),origin(),
this->shape(),this->strides(),this->index_bases()));
}
iterator end() {
return iterator(iter_base(*super_type::index_bases()+*super_type::shape(),origin(),
super_type::shape(),super_type::strides(),super_type::index_bases()));
return iterator(iter_base(*this->index_bases()+*this->shape(),origin(),
this->shape(),this->strides(),this->index_bases()));
}
// RG - rbegin() and rend() written naively to thwart MSVC ICE.

40
include/boost/multi_array/view.hpp
View File

@@ -76,13 +76,13 @@ public:
void reindex(const BaseList& values) {
boost::copy_n(values.begin(),num_dimensions(),index_base_list_.begin());
origin_offset_ =
super_type::calculate_indexing_offset(stride_list_,index_base_list_);
calculate_indexing_offset(stride_list_,index_base_list_);
}
void reindex(index value) {
index_base_list_.assign(value);
origin_offset_ =
super_type::calculate_indexing_offset(stride_list_,index_base_list_);
calculate_indexing_offset(stride_list_,index_base_list_);
}
size_type num_dimensions() const { return NumDims; }
@@ -291,9 +291,9 @@ public:
ConstMultiArrayConcept<ConstMultiArray,NumDims> >();
// make sure the dimensions agree
assert(other.num_dimensions() == num_dimensions());
assert(std::equal(other.shape(),other.shape()+num_dimensions(),
shape()));
assert(other.num_dimensions() == this->num_dimensions());
assert(std::equal(other.shape(),other.shape()+this->num_dimensions(),
this->shape()));
// iterator-based copy
std::copy(other.begin(),other.end(),begin());
return *this;
@@ -303,30 +303,30 @@ public:
multi_array_view& operator=(const multi_array_view& other) {
if (&other != this) {
// make sure the dimensions agree
assert(other.num_dimensions() == super_type::num_dimensions());
assert(std::equal(other.shape(),other.shape()+super_type::num_dimensions(),
super_type::shape()));
assert(other.num_dimensions() == this->num_dimensions());
assert(std::equal(other.shape(),other.shape()+this->num_dimensions(),
this->shape()));
// iterator-based copy
std::copy(other.begin(),other.end(),begin());
}
return *this;
}
element* origin() { return super_type::base_+super_type::origin_offset_; }
element* origin() { return this->base_+this->origin_offset_; }
template <class IndexList>
element& operator()(const IndexList& indices) {
return super_type::access_element(boost::type<element&>(),
origin(),
indices,strides());
indices,this->strides());
}
reference operator[](index idx) {
return super_type::access(boost::type<reference>(),
idx,origin(),
super_type::shape(),super_type::strides(),
super_type::index_bases());
this->shape(),this->strides(),
this->index_bases());
}
@@ -343,21 +343,23 @@ public:
return
super_type::generate_array_view(boost::type<return_type>(),
indices,
shape(),
strides(),
index_bases(),
this->shape(),
this->strides(),
this->index_bases(),
origin());
}
iterator begin() {
return iterator(iter_base(*super_type::index_bases(),origin(),
super_type::shape(),super_type::strides(),super_type::index_bases()));
return iterator(iter_base(*this->index_bases(),origin(),
this->shape(),this->strides(),
this->index_bases()));
}
iterator end() {
return iterator(iter_base(*super_type::index_bases()+*super_type::shape(),origin(),
super_type::shape(),super_type::strides(),super_type::index_bases()));
return iterator(iter_base(*this->index_bases()+*this->shape(),origin(),
this->shape(),this->strides(),
this->index_bases()));
}
reverse_iterator rbegin() {