Mercurial > octave

changeset 22981:4a53c121cdec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix a few mistakes in F77_INT changes * __pchip_deriv__.cc, CMatrix.cc, CRowVector.cc, dRowVector.cc, fCRowVector.cc, fRowVector.cc: Use F77_INT in a few more places. * fCMatrix.cc (operator +=): Revert change from octave_idx_type to F77_INT.
author John W. Eaton <jwe@octave.org>
date Thu, 29 Dec 2016 14:34:05 -0500
parents b4346e1b5b45
children 360801053297
files libinterp/corefcn/__pchip_deriv__.cc liboctave/array/CMatrix.cc liboctave/array/CRowVector.cc liboctave/array/dRowVector.cc liboctave/array/fCMatrix.cc liboctave/array/fCRowVector.cc liboctave/array/fRowVector.cc
diffstat 7 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/__pchip_deriv__.cc	Thu Dec 29 14:29:27 2016 -0500
+++ b/libinterp/corefcn/__pchip_deriv__.cc	Thu Dec 29 14:34:05 2016 -0500
@@ -107,7 +107,7 @@
           Matrix dmat (nyr, nyc);
 
           F77_INT ierr;
-          const octave_idx_type incfd = rows ? nyr : 1;
+          const F77_INT incfd = rows ? to_f77_int (nyr) : 1;
           volatile const octave_idx_type inc = rows ? 1 : nyr;
           volatile octave_idx_type k = 0;
 
--- a/liboctave/array/CMatrix.cc	Thu Dec 29 14:29:27 2016 -0500
+++ b/liboctave/array/CMatrix.cc	Thu Dec 29 14:34:05 2016 -0500
@@ -2783,7 +2783,7 @@
 
   if (len != 0)
     {
-      F77_INT a_len = (a.numel ());
+      F77_INT a_len = to_f77_int (a.numel ());
 
       retval = ComplexMatrix (len, a_len);
       Complex *c = retval.fortran_vec ();
--- a/liboctave/array/CRowVector.cc	Thu Dec 29 14:29:27 2016 -0500
+++ b/liboctave/array/CRowVector.cc	Thu Dec 29 14:34:05 2016 -0500
@@ -296,7 +296,7 @@
     {
       // Transpose A to form A'*x == (x'*A)'
 
-      octave_idx_type ld = a_nr;
+      F77_INT ld = a_nr;
 
       retval.resize (a_nc);
       Complex *y = retval.fortran_vec ();
--- a/liboctave/array/dRowVector.cc	Thu Dec 29 14:29:27 2016 -0500
+++ b/liboctave/array/dRowVector.cc	Thu Dec 29 14:34:05 2016 -0500
@@ -184,7 +184,7 @@
     {
       // Transpose A to form A'*x == (x'*A)'
 
-      octave_idx_type ld = a_nr;
+      F77_INT ld = a_nr;
 
       retval.resize (a_nc);
       double *y = retval.fortran_vec ();
--- a/liboctave/array/fCMatrix.cc	Thu Dec 29 14:29:27 2016 -0500
+++ b/liboctave/array/fCMatrix.cc	Thu Dec 29 14:34:05 2016 -0500
@@ -2824,8 +2824,8 @@
 FloatComplexMatrix&
 FloatComplexMatrix::operator += (const FloatDiagMatrix& a)
 {
-  F77_INT nr = rows ();
-  F77_INT nc = cols ();
+  octave_idx_type nr = rows ();
+  octave_idx_type nc = cols ();
 
   octave_idx_type a_nr = a.rows ();
   octave_idx_type a_nc = a.cols ();
--- a/liboctave/array/fCRowVector.cc	Thu Dec 29 14:29:27 2016 -0500
+++ b/liboctave/array/fCRowVector.cc	Thu Dec 29 14:34:05 2016 -0500
@@ -297,7 +297,7 @@
     {
       // Transpose A to form A'*x == (x'*A)'
 
-      octave_idx_type ld = a_nr;
+      F77_INT ld = a_nr;
 
       retval.resize (a_nc);
       FloatComplex *y = retval.fortran_vec ();
--- a/liboctave/array/fRowVector.cc	Thu Dec 29 14:29:27 2016 -0500
+++ b/liboctave/array/fRowVector.cc	Thu Dec 29 14:34:05 2016 -0500
@@ -184,7 +184,7 @@
     {
       // Transpose A to form A'*x == (x'*A)'
 
-      octave_idx_type ld = a_nr;
+      F77_INT ld = a_nr;
 
       retval.resize (a_nc);
       float *y = retval.fortran_vec ();