Mercurial > mxe-octave

changeset 4736:11a3d14a1562

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch of-struct and of-database iostreams when using dev octave (Bug #54165) * src/of-database-1-fixes.patch: new patch * dist-files.mk: add src/of-database-1-fixes.patch * src/of-struct-1-fixes.patch: add include <iostreams< to error-helpers.cc
author John Donoghue
date Fri, 22 Jun 2018 08:28:33 -0400
parents 4cea16af20b4
children a7964a7e98b5
files dist-files.mk src/of-database-1-fixes.patch src/of-struct-1-fixes.patch
diffstat 3 files changed, 25 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Fri Jun 22 08:28:05 2018 -0400
+++ b/dist-files.mk	Fri Jun 22 08:28:33 2018 -0400
@@ -462,6 +462,7 @@
   of-communications.mk \
   of-control.mk \
   of-data-smoothing.mk \
+  of-database-1-fixes.patch \
   of-database.mk \
   of-dataframe.mk \
   of-dicom-1-fixes.patch \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-database-1-fixes.patch	Fri Jun 22 08:28:33 2018 -0400
@@ -0,0 +1,12 @@
+diff -r 7cfa3e9df6e4 src/error-helpers.cc
+--- a/src/error-helpers.cc	Thu May 24 21:19:27 2018 +0200
++++ b/src/error-helpers.cc	Fri Jun 22 08:16:46 2018 -0400
+@@ -18,7 +18,7 @@
+ */
+ 
+ #include <octave/oct.h>
+-
++#include <iostream>
+ #include "error-helpers.h"
+ 
+ // call verror
--- a/src/of-struct-1-fixes.patch	Fri Jun 22 08:28:05 2018 -0400
+++ b/src/of-struct-1-fixes.patch	Fri Jun 22 08:28:33 2018 -0400
@@ -115,3 +115,15 @@
        { \
          err = true; \
        }
+diff -r e0a0e577f1ae src/error-helpers.cc
+--- a/src/error-helpers.cc	Fri Jun 22 07:52:08 2018 -0400
++++ b/src/error-helpers.cc	Fri Jun 22 07:56:28 2018 -0400
+@@ -18,7 +18,7 @@
+ */
+ 
+ #include <octave/oct.h>
+-
++#include <iostream>
+ #include "error-helpers.h"
+ 
+ // call verror