changeset 5980:d256d1c6f55b

of-optim: Fix for Octave 8 (bug #61562). * src/of-optim-1-verror.patch: Add patch to fix compilation with Octave 8. * dist-files.mk: Add new file to dist.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 26 Nov 2021 16:31:38 +0100
parents e617e117f94d
children b507e4ab93d5
files dist-files.mk src/of-optim-1-verror.patch
diffstat 2 files changed, 23 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Thu Nov 25 19:14:38 2021 +0100
+++ b/dist-files.mk	Fri Nov 26 16:31:38 2021 +0100
@@ -527,6 +527,7 @@
   of-odepkg-2-fixes.patch \
   of-odepkg-3-deprecated.patch \
   of-odepkg.mk \
+  of-optim-1-verror.patch \
   of-optim.mk \
   of-optiminterp.mk \
   of-quaternion-1-cross-fixes.patch \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-optim-1-verror.patch	Fri Nov 26 16:31:38 2021 +0100
@@ -0,0 +1,22 @@
+# HG changeset patch
+# User Markus Mützel <markus.muetzel@gmx.de>
+# Date 1637940821 -3600
+#      Fri Nov 26 16:33:41 2021 +0100
+# Node ID c63a32659f1f68b7ec0e3d7431746fded68594ca
+# Parent  4c32793ffd1a83e3d4d918074bdaf659508d416a
+Fix compilation with Octave 8 (bug #61562).
+
+* src/error-helpers.h: Use wrapper function.
+
+diff -r 4c32793ffd1a -r c63a32659f1f src/error-helpers.h
+--- a/src/error-helpers.h	Wed Mar 31 19:56:59 2021 +0200
++++ b/src/error-helpers.h	Fri Nov 26 16:33:41 2021 +0100
+@@ -64,7 +64,7 @@
+       } \
+     catch (OCTAVE__EXECUTION_EXCEPTION& e) \
+       { \
+-        verror (e, __VA_ARGS__); \
++        c_verror (e, __VA_ARGS__); \
+       }
+ #endif
+