Mercurial > octave-antonio
changeset 10124:e5c6600e3400
use octave_idx_type where needed
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Sun, 17 Jan 2010 15:13:53 +0100 |
| parents | 8590f3c51868 |
| children | 82ed1b4c3011 |
| files | liboctave/CMatrix.cc liboctave/ChangeLog liboctave/fCMatrix.cc |
| diffstat | 3 files changed, 13 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/CMatrix.cc Sun Jan 17 20:32:38 2010 +0000 +++ b/liboctave/CMatrix.cc Sun Jan 17 15:13:53 2010 +0100 @@ -3788,8 +3788,8 @@ a.data (), lda, 0.0, c, a_nr F77_CHAR_ARG_LEN (1) F77_CHAR_ARG_LEN (1))); - for (int j = 0; j < a_nr; j++) - for (int i = 0; i < j; i++) + for (octave_idx_type j = 0; j < a_nr; j++) + for (octave_idx_type i = 0; i < j; i++) retval.xelem (j,i) = std::conj (retval.xelem (i,j)); } else @@ -3800,8 +3800,8 @@ a.data (), lda, 0.0, c, a_nr F77_CHAR_ARG_LEN (1) F77_CHAR_ARG_LEN (1))); - for (int j = 0; j < a_nr; j++) - for (int i = 0; i < j; i++) + for (octave_idx_type j = 0; j < a_nr; j++) + for (octave_idx_type i = 0; i < j; i++) retval.xelem (j,i) = retval.xelem (i,j); }
--- a/liboctave/ChangeLog Sun Jan 17 20:32:38 2010 +0000 +++ b/liboctave/ChangeLog Sun Jan 17 15:13:53 2010 +0100 @@ -1,3 +1,8 @@ +2010-01-17 Jaroslav Hajek <highegg@gmail.com> + + * CMatrix.cc (xgemm): Use octave_idx_type rather than int. + * fCMatrix.cc (xgemm): Ditto. + 2010-01-16 Michael Goffioul <michael.goffioul@gmail.com> * oct-time.cc: Avoid to include nonneeded headers from Win32 API,
--- a/liboctave/fCMatrix.cc Sun Jan 17 20:32:38 2010 +0000 +++ b/liboctave/fCMatrix.cc Sun Jan 17 15:13:53 2010 +0100 @@ -3781,8 +3781,8 @@ a.data (), lda, 0.0, c, a_nr F77_CHAR_ARG_LEN (1) F77_CHAR_ARG_LEN (1))); - for (int j = 0; j < a_nr; j++) - for (int i = 0; i < j; i++) + for (octave_idx_type j = 0; j < a_nr; j++) + for (octave_idx_type i = 0; i < j; i++) retval.xelem (j,i) = std::conj (retval.xelem (i,j)); } else @@ -3793,8 +3793,8 @@ a.data (), lda, 0.0, c, a_nr F77_CHAR_ARG_LEN (1) F77_CHAR_ARG_LEN (1))); - for (int j = 0; j < a_nr; j++) - for (int i = 0; i < j; i++) + for (octave_idx_type j = 0; j < a_nr; j++) + for (octave_idx_type i = 0; i < j; i++) retval.xelem (j,i) = retval.xelem (i,j); }