# HG changeset patch # User jwe # Date 1157487230 0 # Node ID 1ed991f0ed61773eccb9c53c575c11ad55577e48 # Parent dadcfe8b7ba424f04c0cbeee8a703bb216a50570 [project @ 2006-09-05 20:13:50 by jwe] diff -r dadcfe8b7ba4 -r 1ed991f0ed61 src/ChangeLog --- a/src/ChangeLog Tue Sep 05 15:33:24 2006 +0000 +++ b/src/ChangeLog Tue Sep 05 20:13:50 2006 +0000 @@ -1,3 +1,8 @@ +2006-09-05 John W. Eaton + + * mex.cc (mxArray_sparse::as_octave_value): Cast nzmax to + octave_idx_type for sparse matrix constructors. + 2006-09-01 John W. Eaton * dirfns.cc: Don't handle nargout == 0 as a special case. diff -r dadcfe8b7ba4 -r 1ed991f0ed61 src/mex.cc --- a/src/mex.cc Tue Sep 05 15:33:24 2006 +0000 +++ b/src/mex.cc Tue Sep 05 20:13:50 2006 +0000 @@ -1392,7 +1392,8 @@ { bool *ppr = static_cast (pr); - SparseBoolMatrix val (get_m (), get_n (), nzmax); + SparseBoolMatrix val (get_m (), get_n (), + static_cast (nzmax)); for (int i = 0; i < nzmax; i++) { @@ -1418,7 +1419,8 @@ double *ppr = static_cast (pr); double *ppi = static_cast (pi); - SparseComplexMatrix val (get_m (), get_n (), nzmax); + SparseComplexMatrix val (get_m (), get_n (), + static_cast (nzmax)); for (int i = 0; i < nzmax; i++) { @@ -1435,7 +1437,8 @@ { double *ppr = static_cast (pr); - SparseMatrix val (get_m (), get_n (), nzmax); + SparseMatrix val (get_m (), get_n (), + static_cast (nzmax)); for (int i = 0; i < nzmax; i++) {