Mercurial > mxe-octave

changeset 4728:d9fa775ab4e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compiling of-struct with Octave 5.0 dev (bug #54013).
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 30 May 2018 20:18:43 +0200
parents 4ec5d6df4c4a
children 88f905a83cb5
files dist-files.mk src/of-struct-1-fixes.patch
diffstat 2 files changed, 118 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Wed May 30 19:41:01 2018 +0200
+++ b/dist-files.mk	Wed May 30 20:18:43 2018 +0200
@@ -527,6 +527,7 @@
   of-strings-1-fixes.patch \
   of-strings.mk \
   of-struct.mk \
+  of-struct-1-fixes.patch \
   of-tisean.mk \
   of-tsa.mk \
   of-video-1-fixes.patch \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-struct-1-fixes.patch	Wed May 30 20:18:43 2018 +0200
@@ -0,0 +1,117 @@
+diff -uNr a/src/error-helpers.cc b/src/error-helpers.cc
+--- a/src/error-helpers.cc	2016-09-18 12:09:18.000000000 -0400
++++ b/src/error-helpers.cc	2018-04-09 13:00:47.302704176 -0400
+@@ -24,7 +24,7 @@
+ // call verror
+ #ifdef HAVE_OCTAVE_VERROR_ARG_EXC
+ void
+-c_verror (octave_execution_exception& e, const char *fmt, ...)
++c_verror (octave::execution_exception& e, const char *fmt, ...)
+ {
+   va_list args;
+   va_start (args, fmt);
+@@ -33,7 +33,7 @@
+ }
+ #else
+ void
+-c_verror (const octave_execution_exception&, const char *fmt, ...)
++c_verror (const octave::execution_exception&, const char *fmt, ...)
+ {
+   va_list args;
+   va_start (args, fmt);
+diff -uNr a/src/error-helpers.h b/src/error-helpers.h
+--- a/src/error-helpers.h	2016-09-18 12:09:18.000000000 -0400
++++ b/src/error-helpers.h	2018-04-09 13:01:12.285532698 -0400
+@@ -26,9 +26,9 @@
+ 
+ // call verror
+ #ifdef HAVE_OCTAVE_VERROR_ARG_EXC
+-void c_verror (octave_execution_exception&, const char *, ...);
++void c_verror (octave::execution_exception&, const char *, ...);
+ #else
+-void c_verror (const octave_execution_exception&, const char *, ...);
++void c_verror (const octave::execution_exception&, const char *, ...);
+ #endif
+ 
+ // call verror
+@@ -37,7 +37,7 @@
+ // both if Octave uses exceptions for errors and if it still uses
+ // error_state. In the latter case return 'retval'.
+ #ifdef HAVE_OCTAVE_ERROR_STATE
+-  // can throw octave_execution_exception despite of this
++  // can throw octave::execution_exception despite of this
+   #define CHECK_ERROR(code, retval, ...)      \
+     try \
+       { \
+@@ -50,7 +50,7 @@
+             return retval; \
+           } \
+       } \
+-    catch (octave_execution_exception& e) \
++    catch (octave::execution_exception& e) \
+       { \
+         c_verror (e, __VA_ARGS__); \
+  \
+@@ -60,7 +60,7 @@
+       { \
+         code ; \
+       } \
+-    catch (octave_execution_exception& e) \
++    catch (octave::execution_exception& e) \
+       { \
+         c_verror (e, __VA_ARGS__); \
+  \
+@@ -70,7 +70,7 @@
+ // Octave doesn't throw exceptions for errors but still uses
+ // error_state.
+ #ifdef HAVE_OCTAVE_ERROR_STATE
+-  // can throw octave_execution_exception despite of this
++  // can throw octave::execution_exception despite of this
+   #define CHECK_ERROR_EXIT1(code, ...) \
+     try \
+       { \
+@@ -83,7 +83,7 @@
+             exit (1); \
+           } \
+       } \
+-    catch (octave_execution_exception&) \
++    catch (octave::execution_exception&) \
+       { \
+         c_verror (e, __VA_ARGS__); \
+  \
+@@ -95,7 +95,7 @@
+       { \
+         code ; \
+       } \
+-    catch (octave_execution_exception&) \
++    catch (octave::execution_exception&) \
+       { \
+         c_verror (e, __VA_ARGS__); \
+  \
+@@ -107,7 +107,7 @@
+ // Octave uses exceptions for errors and if it still uses
+ // error_state. In the latter case reset error_state to 0.
+ #ifdef HAVE_OCTAVE_ERROR_STATE
+-  // can throw octave_execution_exception despite of this
++  // can throw octave::execution_exception despite of this
+   #define SET_ERR(code, err) \
+     err = false; \
+  \
+@@ -120,7 +120,7 @@
+             err = true; \
+           } \
+       } \
+-    catch (octave_execution_exception&) \
++    catch (octave::execution_exception&) \
+       { \
+         err = true; \
+       }
+@@ -132,7 +132,7 @@
+       { \
+         code ; \
+       } \
+-    catch (octave_execution_exception&) \
++    catch (octave::execution_exception&) \
+       { \
+         err = true; \
+       }