Skip to content

Fix #39 Replace deprecated boost::array::assign with boost::array::fill #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GreenGary wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix #39 Replace deprecated boost::array::assign with boost::array::fill #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/boost/multi_array/multi_array_ref.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class const_multi_array_ref :
boost::function_requires<
CollectionConcept<ExtentList> >();

index_base_list_.assign(0);
index_base_list_.fill(0);
init_multi_array_ref(extents.begin());
}

Expand Down Expand Up @@ -340,7 +340,7 @@ class const_multi_array_ref :
init_multi_array_ref(extents);
} else {
boost::array<index,NumDims> extent_list;
extent_list.assign(0);
extent_list.fill(0);
init_multi_array_ref(extent_list.begin());
}
}
Expand Down
4 changes: 2 additions & 2 deletions include/boost/multi_array/storage_order.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ namespace boost {
for (size_type i=0; i != NumDims; ++i) {
ordering_[i] = NumDims - 1 - i;
}
ascending_.assign(true);
ascending_.fill(true);
}

general_storage_order(const fortran_storage_order&) {
for (size_type i=0; i != NumDims; ++i) {
ordering_[i] = i;
}
ascending_.assign(true);
ascending_.fill(true);
}

size_type ordering(size_type dim) const { return ordering_[dim]; }
Expand Down
4 changes: 2 additions & 2 deletions include/boost/multi_array/view.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class const_multi_array_view :
}

void reindex(index value) {
index_base_list_.assign(value);
index_base_list_.fill(value);
origin_offset_ =
this->calculate_indexing_offset(stride_list_,index_base_list_);
}
Expand Down Expand Up @@ -231,7 +231,7 @@ class const_multi_array_view :
const boost::array<Index,NumDims>& strides):
base_(base), origin_offset_(0) {

index_base_list_.assign(0);
index_base_list_.fill(0);

// Get the extents and strides
boost::detail::multi_array::
Expand Down