Mercurial > octave

changeset 22952:7c9492d3b421

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use F77_INT instead of octave_idx_type for liboctave GEPBALANCE functions * gepbalance.cc: Use F77_INT instead of octave_idx_type for integer data passed to Fortran subroutines.
author John W. Eaton <jwe@octave.org>
date Mon, 26 Dec 2016 21:28:03 -0500
parents 2e6a327e7903
children fd649fd3db75
files liboctave/numeric/gepbalance.cc
diffstat 1 files changed, 20 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/numeric/gepbalance.cc	Mon Dec 26 21:24:32 2016 -0500
+++ b/liboctave/numeric/gepbalance.cc	Mon Dec 26 21:28:03 2016 -0500
@@ -45,7 +45,7 @@
     gepbalance<Matrix>::init (const Matrix& a, const Matrix& b,
                               const std::string& balance_job)
     {
-      octave_idx_type n = a.cols ();
+      F77_INT n = to_f77_int (a.cols ());
 
       if (a.rows () != n)
         (*current_liboctave_error_handler) ("GEPBALANCE requires square matrix");
@@ -53,9 +53,9 @@
       if (a.dims () != b.dims ())
         octave::err_nonconformant ("GEPBALANCE", n, n, b.rows(), b.cols());
 
-      octave_idx_type info;
-      octave_idx_type ilo;
-      octave_idx_type ihi;
+      F77_INT info;
+      F77_INT ilo;
+      F77_INT ihi;
 
       OCTAVE_LOCAL_BUFFER (double, plscale, n);
       OCTAVE_LOCAL_BUFFER (double, prscale, n);
@@ -75,7 +75,7 @@
 
       balancing_mat = Matrix (n, n, 0.0);
       balancing_mat2 = Matrix (n, n, 0.0);
-      for (octave_idx_type i = 0; i < n; i++)
+      for (F77_INT i = 0; i < n; i++)
         {
           octave_quit ();
           balancing_mat.elem (i ,i) = 1.0;
@@ -109,7 +109,7 @@
     gepbalance<FloatMatrix>::init (const FloatMatrix& a, const FloatMatrix& b,
                                    const std::string& balance_job)
     {
-      octave_idx_type n = a.cols ();
+      F77_INT n = to_f77_int (a.cols ());
 
       if (a.rows () != n)
         (*current_liboctave_error_handler)
@@ -118,9 +118,9 @@
       if (a.dims () != b.dims ())
         octave::err_nonconformant ("FloatGEPBALANCE", n, n, b.rows(), b.cols());
 
-      octave_idx_type info;
-      octave_idx_type ilo;
-      octave_idx_type ihi;
+      F77_INT info;
+      F77_INT ilo;
+      F77_INT ihi;
 
       OCTAVE_LOCAL_BUFFER (float, plscale, n);
       OCTAVE_LOCAL_BUFFER (float, prscale, n);
@@ -140,7 +140,7 @@
 
       balancing_mat = FloatMatrix (n, n, 0.0);
       balancing_mat2 = FloatMatrix (n, n, 0.0);
-      for (octave_idx_type i = 0; i < n; i++)
+      for (F77_INT i = 0; i < n; i++)
         {
           octave_quit ();
           balancing_mat.elem (i ,i) = 1.0;
@@ -175,7 +175,7 @@
                                      const ComplexMatrix& b,
                                      const std::string& balance_job)
     {
-      octave_idx_type n = a.cols ();
+      F77_INT n = to_f77_int (a.cols ());
 
       if (a.rows () != n)
         (*current_liboctave_error_handler)
@@ -184,9 +184,9 @@
       if (a.dims () != b.dims ())
         octave::err_nonconformant ("ComplexGEPBALANCE", n, n, b.rows(), b.cols());
 
-      octave_idx_type info;
-      octave_idx_type ilo;
-      octave_idx_type ihi;
+      F77_INT info;
+      F77_INT ilo;
+      F77_INT ihi;
 
       OCTAVE_LOCAL_BUFFER (double, plscale, n);
       OCTAVE_LOCAL_BUFFER (double, prscale,  n);
@@ -206,7 +206,7 @@
 
       balancing_mat = Matrix (n, n, 0.0);
       balancing_mat2 = Matrix (n, n, 0.0);
-      for (octave_idx_type i = 0; i < n; i++)
+      for (F77_INT i = 0; i < n; i++)
         {
           octave_quit ();
           balancing_mat.elem (i ,i) = 1.0;
@@ -241,7 +241,7 @@
                                           const FloatComplexMatrix& b,
                                           const std::string& balance_job)
     {
-      octave_idx_type n = a.cols ();
+      F77_INT n = to_f77_int (a.cols ());
 
       if (a.rows () != n)
         {
@@ -253,9 +253,9 @@
       if (a.dims () != b.dims ())
         octave::err_nonconformant ("FloatComplexGEPBALANCE", n, n, b.rows(), b.cols());
 
-      octave_idx_type info;
-      octave_idx_type ilo;
-      octave_idx_type ihi;
+      F77_INT info;
+      F77_INT ilo;
+      F77_INT ihi;
 
       OCTAVE_LOCAL_BUFFER (float, plscale, n);
       OCTAVE_LOCAL_BUFFER (float, prscale, n);
@@ -275,7 +275,7 @@
 
       balancing_mat = FloatMatrix (n, n, 0.0);
       balancing_mat2 = FloatMatrix (n, n, 0.0);
-      for (octave_idx_type i = 0; i < n; i++)
+      for (F77_INT i = 0; i < n; i++)
         {
           octave_quit ();
           balancing_mat.elem (i ,i) = 1.0;