Mercurial > hg > octave-lyh
changeset 5982:1ed991f0ed61
[project @ 2006-09-05 20:13:50 by jwe]
author | jwe |
---|---|
date | Tue, 05 Sep 2006 20:13:50 +0000 |
parents | dadcfe8b7ba4 |
children | ae09df27153f |
files | src/ChangeLog src/mex.cc |
diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-09-05 John W. Eaton <jwe@octave.org> + + * mex.cc (mxArray_sparse::as_octave_value): Cast nzmax to + octave_idx_type for sparse matrix constructors. + 2006-09-01 John W. Eaton <jwe@octave.org> * dirfns.cc: Don't handle nargout == 0 as a special case.
--- a/src/mex.cc +++ b/src/mex.cc @@ -1392,7 +1392,8 @@ { bool *ppr = static_cast<bool *> (pr); - SparseBoolMatrix val (get_m (), get_n (), nzmax); + SparseBoolMatrix val (get_m (), get_n (), + static_cast<octave_idx_type> (nzmax)); for (int i = 0; i < nzmax; i++) { @@ -1418,7 +1419,8 @@ double *ppr = static_cast<double *> (pr); double *ppi = static_cast<double *> (pi); - SparseComplexMatrix val (get_m (), get_n (), nzmax); + SparseComplexMatrix val (get_m (), get_n (), + static_cast<octave_idx_type> (nzmax)); for (int i = 0; i < nzmax; i++) { @@ -1435,7 +1437,8 @@ { double *ppr = static_cast<double *> (pr); - SparseMatrix val (get_m (), get_n (), nzmax); + SparseMatrix val (get_m (), get_n (), + static_cast<octave_idx_type> (nzmax)); for (int i = 0; i < nzmax; i++) {