changeset 4919:9cf8d7a723d7

of-struct: add dev 6 fixes * src/of-struct-2-devfixes.patch: new file * dist-files.mk: add ref to of-struct-2-devfixes.patch
author John Donoghue
date Thu, 03 Jan 2019 09:07:06 -0500
parents 48b9473dd2ad
children f84bb02890c0
files dist-files.mk src/of-struct-2-devfixes.patch
diffstat 2 files changed, 13 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Thu Jan 03 09:05:01 2019 -0500
+++ b/dist-files.mk	Thu Jan 03 09:07:06 2019 -0500
@@ -534,6 +534,7 @@
   of-strings-1-fixes.patch \
   of-strings.mk \
   of-struct-1-fixes.patch \
+  of-struct-2-devfixes.patch \
   of-struct.mk \
   of-tisean-1-fixes.patch \
   of-tisean.mk \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-struct-2-devfixes.patch	Thu Jan 03 09:07:06 2019 -0500
@@ -0,0 +1,12 @@
+diff -ur struct-1.0.15.orig/src/structcat.cc struct-1.0.15/src/structcat.cc
+--- struct-1.0.15.orig/src/structcat.cc	2019-01-02 12:23:45.625511373 -0500
++++ struct-1.0.15/src/structcat.cc	2019-01-02 12:25:21.571914227 -0500
+@@ -132,7 +132,7 @@
+ 
+   for (octave_idx_type i = m1_id; i < n_args; i++)
+     {
+-      if (! args(i).is_map ())
++      if (! args(i).isstruct ())
+         {
+           error ("%s: some argument not a structure", fname.c_str ());
+