boost/ublas
2
0
Fork 0
mirror of https://github.com/boostorg/ublas.git synced 2026-02-28 05:42:14 +00:00
Code Issues Projects Releases Wiki Activity

fix: size_t used instead of size_type in resize.

Browse Source 
Only CW8 noticed this!

svn path=/trunk/boost/boost/numeric/ublas/; revision=23614
This commit is contained in:
Michael Stevens
2004-07-16 07:54:36 +00:00
parent b73264ca55
commit d93e7fa3f4
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/boost/numeric/ublas/matrix.hpp
View File

@@ -114,13 +114,13 @@ namespace boost { namespace numeric { namespace ublas {
if (preserve) {
self_type temporary (size1, size2);
// Common elements to preserve
const size_t size1_min = (std::min) (size1, size1_);
const size_t size2_min = (std::min) (size2, size2_);
const size_type size1_min = (std::min) (size1, size1_);
const size_type size2_min = (std::min) (size2, size2_);
// Order loop for i-major and j-minor sizes
const size_t i_size = functor_type::size1 (size1_min, size2_min);
const size_t j_size = functor_type::size2 (size1_min, size2_min);
for (size_t i = 0; i != i_size; ++i) { // indexing copy over major
for (size_t j = 0; j != j_size; ++j) {
const size_type i_size = functor_type::size1 (size1_min, size2_min);
const size_type j_size = functor_type::size2 (size1_min, size2_min);
for (size_t_type i = 0; i != i_size; ++i) { // indexing copy over major
for (size_type j = 0; j != j_size; ++j) {
temporary.data () [functor_type::element (functor_type::element1(i,i_size, j,j_size), size1, functor_type::element2(i,i_size, j,j_size), size2)] =
data() [functor_type::element (functor_type::element1(i,i_size, j,j_size), size1_, functor_type::element2(i,i_size, j,j_size), size2_)];
}
@@ -3375,10 +3375,10 @@ namespace boost { namespace numeric { namespace ublas {
if (preserve) {
self_type temporary (size1, size2);
// Common elements to preserve
const size_t size1_min = (std::min) (size1, size1_);
const size_t size2_min = (std::min) (size2, size2_);
for (size_t i = 0; i != size1_min; ++i) { // indexing copy over major
for (size_t j = 0; j != size1_min; ++j) {
const size_type size1_min = (std::min) (size1, size1_);
const size_type size2_min = (std::min) (size2, size2_);
for (size_type i = 0; i != size1_min; ++i) { // indexing copy over major
for (size_type j = 0; j != size1_min; ++j) {
temporary.data_[i][j] = data_[i][j];
}
}