boost_mirror/multi_array
1
0
Fork 0
mirror of https://github.com/boostorg/multi_array.git synced 2025-05-11 21:33:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add super_type:: so 2-phase lookup works right

Browse Source 
[SVN r16378]
This commit is contained in:
Beman Dawes 2002-11-23 18:17:43 +00:00
parent 8387e84d8f
commit e5909ce409
4 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/multi_array.hpp
View File

@ -143,7 +143,7 @@ public:
sub_array<T,NumDims>& rhs) :
super_type(rhs) {
allocate_space();
std::copy(rhs.begin(),rhs.end(),begin());
std::copy(rhs.begin(),rhs.end(),super_type::begin());
}
// Since assignment is a deep copy, multi_array_ref

26
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_ =
calculate_origin_offset(stride_list_,extent_list_,
super_type::calculate_origin_offset(stride_list_,extent_list_,
storage_,index_base_list_);
}
@ -467,18 +467,18 @@ public:
if (&other != this) {
// 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() == super_type::num_dimensions());
assert(std::equal(other.shape(),other.shape()+super_type::num_dimensions(),
super_type::shape()));
// iterator-based copy
std::copy(other.begin(),other.end(),begin());
}
return *this;
}
element* origin() { return base_+origin_offset_; }
element* origin() { return super_type::base_+super_type::origin_offset_; }
element* data() { return base_; }
element* data() { return super_type::base_; }
template <class IndexList>
element& operator()(const IndexList& indices) {
@ -493,8 +493,8 @@ public:
reference operator[](index idx) {
return super_type::access(boost::type<reference>(),
idx,origin(),
shape(),strides(),
index_bases());
super_type::shape(),super_type::strides(),
super_type::index_bases());
}
@ -519,13 +519,13 @@ public:
iterator begin() {
return iterator(iter_base(*index_bases(),origin(),shape(),
strides(),index_bases()));
return iterator(iter_base(*super_type::index_bases(),origin(),super_type::shape(),
super_type::strides(),super_type::index_bases()));
}
iterator end() {
return iterator(iter_base(*index_bases()+*shape(),origin(),
shape(),strides(),index_bases()));
return iterator(iter_base(*super_type::index_bases()+*super_type::shape(),origin(),
super_type::shape(),super_type::strides(),super_type::index_bases()));
}
// RG - rbegin() and rend() written naively to thwart MSVC ICE.
@ -555,7 +555,7 @@ public:
const_reference operator[](index idx) const {
return super_type::access(boost::type<const_reference>(),
idx,origin(),
shape(),strides(),index_bases());
super_type::shape(),super_type::strides(),super_type::index_bases());
}
// See note attached to generate_array_view in base.hpp

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

@ -247,21 +247,21 @@ public:
sub_array& operator=(const sub_array& other) {
if (&other != this) {
// 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() == super_type::num_dimensions());
assert(std::equal(other.shape(),other.shape()+super_type::num_dimensions(),
super_type::shape()));
// iterator-based copy
std::copy(other.begin(),other.end(),begin());
}
return *this;
}
T* origin() { return base_; }
const T* origin() const { return base_; }
T* origin() { return super_type::base_; }
const T* origin() const { return super_type::base_; }
reference operator[](index idx) {
return super_type::access(boost::type<reference>(),
idx,base_,shape(),strides(),index_bases());
idx,super_type::base_,super_type::shape(),super_type::strides(),super_type::index_bases());
}
// see generate_array_view in base.hpp
@ -291,13 +291,13 @@ public:
}
iterator begin() {
return iterator(iter_base(*index_bases(),origin(),
shape(),strides(),index_bases()));
return iterator(iter_base(*super_type::index_bases(),origin(),
super_type::shape(),super_type::strides(),super_type::index_bases()));
}
iterator end() {
return iterator(iter_base(*index_bases()+*shape(),origin(),
shape(),strides(),index_bases()));
return iterator(iter_base(*super_type::index_bases()+*super_type::shape(),origin(),
super_type::shape(),super_type::strides(),super_type::index_bases()));
}
// RG - rbegin() and rend() written naively to thwart MSVC ICE.

24
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_ =
calculate_indexing_offset(stride_list_,index_base_list_);
super_type::calculate_indexing_offset(stride_list_,index_base_list_);
}
void reindex(index value) {
index_base_list_.assign(value);
origin_offset_ =
calculate_indexing_offset(stride_list_,index_base_list_);
super_type::calculate_indexing_offset(stride_list_,index_base_list_);
}
size_type num_dimensions() const { return NumDims; }
@ -303,16 +303,16 @@ public:
multi_array_view& operator=(const multi_array_view& other) {
if (&other != this) {
// 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() == super_type::num_dimensions());
assert(std::equal(other.shape(),other.shape()+super_type::num_dimensions(),
super_type::shape()));
// iterator-based copy
std::copy(other.begin(),other.end(),begin());
}
return *this;
}
element* origin() { return base_+origin_offset_; }
element* origin() { return super_type::base_+super_type::origin_offset_; }
template <class IndexList>
element& operator()(const IndexList& indices) {
@ -325,8 +325,8 @@ public:
reference operator[](index idx) {
return super_type::access(boost::type<reference>(),
idx,origin(),
shape(),strides(),
index_bases());
super_type::shape(),super_type::strides(),
super_type::index_bases());
}
@ -351,13 +351,13 @@ public:
iterator begin() {
return iterator(iter_base(*index_bases(),origin(),
shape(),strides(),index_bases()));
return iterator(iter_base(*super_type::index_bases(),origin(),
super_type::shape(),super_type::strides(),super_type::index_bases()));
}
iterator end() {
return iterator(iter_base(*index_bases()+*shape(),origin(),
shape(),strides(),index_bases()));
return iterator(iter_base(*super_type::index_bases()+*super_type::shape(),origin(),
super_type::shape(),super_type::strides(),super_type::index_bases()));
}
reverse_iterator rbegin() {