Mercurial > mxe-octave

view src/of-control-2-octave-9-compat.patch @ 6530:8ea9085d1f80

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-control: Fix compatibility with Octave 9. * src/of-control-2-octave-9-compat.patch: Add patch that replaces functions and classes that have been deprecated in Octave 7 and removed from Octave 9. * dist-files.mk: Add new file to list.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 17 Nov 2022 10:40:12 +0100
parents
children e09548fd6932
line wrap: on
line source

Replace functions and classes deprecated in Octave 7 and removed from Octave 9.

--- control-3.4.0/src/sl_ab08nd.cc.orig	2022-01-16 15:17:03.000000000 +0100
+++ control-3.4.0/src/sl_ab08nd.cc	2022-11-17 10:22:24.964707565 +0100
@@ -136,10 +136,10 @@
         F77_XFCN (ab08nd, AB08ND,
                  (equil,
                   n, m, p,
-                  a.fortran_vec (), lda,
-                  b.fortran_vec (), ldb,
-                  c.fortran_vec (), ldc,
-                  d.fortran_vec (), ldd,
+                  a.data (), lda,
+                  b.data (), ldb,
+                  c.data (), ldc,
+                  d.data (), ldd,
                   nu, rank, dinfz,
                   nkror, nkrol, infz,
                   kronr, kronl,
@@ -198,7 +198,7 @@
         if (m == 1 && p == 1)
         {
             if (nu < n)
-                gain = c * xpow (a, double (n-1-nu)).matrix_value() * b;
+                gain = c * octave::xpow (a, double (n-1-nu)).matrix_value () * b;
             else
                 gain = d;
         }

--- control-3.4.0/src/lti_input_idx.cc.orig	2022-01-16 15:17:03.000000000 +0100
+++ control-3.4.0/src/lti_input_idx.cc	2022-11-17 10:28:13.630086637 +0100
@@ -93,8 +93,8 @@
       offset = 1;
     }
 
-    Range mat_idx (1, idx-offset);
-    Range opt_idx (idx+1-offset, len);
+    octave::range<double> mat_idx (1, idx-offset);
+    octave::range<double> opt_idx (idx+1-offset, len);
 
     retval(2) = offset;     // abused as logical in the LTI constructors
     retval(1) = opt_idx;