changeset 5983:ffbb9aea3c2a

of-database: Fix for Octave 8 (bug #61567). * src/of-database-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 17:47:02 +0100
parents abf45d06d1db
children 532c6ba0156f
files dist-files.mk src/of-database-1-verror.patch
diffstat 2 files changed, 23 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Fri Nov 26 17:34:26 2021 +0100
+++ b/dist-files.mk	Fri Nov 26 17:47:02 2021 +0100
@@ -481,6 +481,7 @@
   of-control-1-deprecated-warnings.patch \
   of-control.mk \
   of-data-smoothing.mk \
+  of-database-1-verror.patch \
   of-database.mk \
   of-dataframe.mk \
   of-dicom.mk \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-database-1-verror.patch	Fri Nov 26 17:47:02 2021 +0100
@@ -0,0 +1,22 @@
+# HG changeset patch
+# User Markus Mützel <markus.muetzel@gmx.de>
+# Date 1637944272 -3600
+#      Fri Nov 26 17:31:12 2021 +0100
+# Node ID 3d24e71eb8b1eb3325b6c3d5ed56c74cb58646cb
+# Parent  8ce48d0bb822adcbf40aa5ff6b759c3a898a7934
+Fix compilation with Octave 8 (bug #61567).
+
+* src/error-helpers.h: Use wrapper function.
+
+diff -r 8ce48d0bb822 -r 3d24e71eb8b1 src/error-helpers.h
+--- a/src/error-helpers.h	Thu Mar 25 10:59:09 2021 +0100
++++ b/src/error-helpers.h	Fri Nov 26 17:31:12 2021 +0100
+@@ -64,7 +64,7 @@
+       } \
+     catch (OCTAVE__EXECUTION_EXCEPTION& e) \
+       { \
+-        verror (e, __VA_ARGS__); \
++        c_verror (e, __VA_ARGS__); \
+       }
+ #endif
+