Mercurial > mxe-octave

annotate src/of-struct-1-fixes.patch @ 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 d9fa775ab4e7
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4728
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 diff -uNr a/src/error-helpers.cc b/src/error-helpers.cc
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2 --- a/src/error-helpers.cc 2016-09-18 12:09:18.000000000 -0400
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 +++ b/src/error-helpers.cc 2018-04-09 13:00:47.302704176 -0400
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 @@ -24,7 +24,7 @@
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5 // call verror
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 #ifdef HAVE_OCTAVE_VERROR_ARG_EXC
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 void
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 -c_verror (octave_execution_exception& e, const char *fmt, ...)
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 +c_verror (octave::execution_exception& e, const char *fmt, ...)
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 {
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11 va_list args;
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12 va_start (args, fmt);
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 @@ -33,7 +33,7 @@
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 }
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 #else
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 void
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17 -c_verror (const octave_execution_exception&, const char *fmt, ...)
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 +c_verror (const octave::execution_exception&, const char *fmt, ...)
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19 {
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20 va_list args;
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21 va_start (args, fmt);
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22 diff -uNr a/src/error-helpers.h b/src/error-helpers.h
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23 --- a/src/error-helpers.h 2016-09-18 12:09:18.000000000 -0400
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
24 +++ b/src/error-helpers.h 2018-04-09 13:01:12.285532698 -0400
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
25 @@ -26,9 +26,9 @@
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
27 // call verror
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
28 #ifdef HAVE_OCTAVE_VERROR_ARG_EXC
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
29 -void c_verror (octave_execution_exception&, const char *, ...);
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
30 +void c_verror (octave::execution_exception&, const char *, ...);
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
31 #else
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
32 -void c_verror (const octave_execution_exception&, const char *, ...);
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
33 +void c_verror (const octave::execution_exception&, const char *, ...);
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
34 #endif
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
35
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
36 // call verror
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
37 @@ -37,7 +37,7 @@
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
38 // both if Octave uses exceptions for errors and if it still uses
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
39 // error_state. In the latter case return 'retval'.
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
40 #ifdef HAVE_OCTAVE_ERROR_STATE
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
41 - // can throw octave_execution_exception despite of this
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
42 + // can throw octave::execution_exception despite of this
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
43 #define CHECK_ERROR(code, retval, ...) \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
44 try \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
45 { \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
46 @@ -50,7 +50,7 @@
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
47 return retval; \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
48 } \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
49 } \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
50 - catch (octave_execution_exception& e) \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
51 + catch (octave::execution_exception& e) \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
52 { \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
53 c_verror (e, __VA_ARGS__); \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
54 \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
55 @@ -60,7 +60,7 @@
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
56 { \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
57 code ; \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
58 } \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
59 - catch (octave_execution_exception& e) \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
60 + catch (octave::execution_exception& e) \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
61 { \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
62 c_verror (e, __VA_ARGS__); \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
63 \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
64 @@ -70,7 +70,7 @@
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
65 // Octave doesn't throw exceptions for errors but still uses
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
66 // error_state.
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
67 #ifdef HAVE_OCTAVE_ERROR_STATE
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
68 - // can throw octave_execution_exception despite of this
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
69 + // can throw octave::execution_exception despite of this
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
70 #define CHECK_ERROR_EXIT1(code, ...) \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
71 try \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
72 { \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
73 @@ -83,7 +83,7 @@
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
74 exit (1); \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
75 } \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
76 } \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
77 - catch (octave_execution_exception&) \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
78 + catch (octave::execution_exception&) \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
79 { \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
80 c_verror (e, __VA_ARGS__); \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
81 \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
82 @@ -95,7 +95,7 @@
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
83 { \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
84 code ; \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
85 } \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
86 - catch (octave_execution_exception&) \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
87 + catch (octave::execution_exception&) \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
88 { \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
89 c_verror (e, __VA_ARGS__); \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
90 \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
91 @@ -107,7 +107,7 @@
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
92 // Octave uses exceptions for errors and if it still uses
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
93 // error_state. In the latter case reset error_state to 0.
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
94 #ifdef HAVE_OCTAVE_ERROR_STATE
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
95 - // can throw octave_execution_exception despite of this
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
96 + // can throw octave::execution_exception despite of this
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
97 #define SET_ERR(code, err) \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
98 err = false; \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
99 \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
100 @@ -120,7 +120,7 @@
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
101 err = true; \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
102 } \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
103 } \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
104 - catch (octave_execution_exception&) \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
105 + catch (octave::execution_exception&) \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
106 { \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
107 err = true; \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
108 }
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
109 @@ -132,7 +132,7 @@
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
110 { \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
111 code ; \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
112 } \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
113 - catch (octave_execution_exception&) \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
114 + catch (octave::execution_exception&) \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
115 { \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
116 err = true; \
d9fa775ab4e7 Fix compiling of-struct with Octave 5.0 dev (bug #54013).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
117 }
4736
11a3d14a1562 patch of-struct and of-database iostreams when using dev octave (Bug #54165)
John Donoghue
parents: 4728
diff changeset
118 diff -r e0a0e577f1ae src/error-helpers.cc
11a3d14a1562 patch of-struct and of-database iostreams when using dev octave (Bug #54165)
John Donoghue
parents: 4728
diff changeset
119 --- a/src/error-helpers.cc Fri Jun 22 07:52:08 2018 -0400
11a3d14a1562 patch of-struct and of-database iostreams when using dev octave (Bug #54165)
John Donoghue
parents: 4728
diff changeset
120 +++ b/src/error-helpers.cc Fri Jun 22 07:56:28 2018 -0400
11a3d14a1562 patch of-struct and of-database iostreams when using dev octave (Bug #54165)
John Donoghue
parents: 4728
diff changeset
121 @@ -18,7 +18,7 @@
11a3d14a1562 patch of-struct and of-database iostreams when using dev octave (Bug #54165)
John Donoghue
parents: 4728
diff changeset
122 */
11a3d14a1562 patch of-struct and of-database iostreams when using dev octave (Bug #54165)
John Donoghue
parents: 4728
diff changeset
123
11a3d14a1562 patch of-struct and of-database iostreams when using dev octave (Bug #54165)
John Donoghue
parents: 4728
diff changeset
124 #include <octave/oct.h>
11a3d14a1562 patch of-struct and of-database iostreams when using dev octave (Bug #54165)
John Donoghue
parents: 4728
diff changeset
125 -
11a3d14a1562 patch of-struct and of-database iostreams when using dev octave (Bug #54165)
John Donoghue
parents: 4728
diff changeset
126 +#include <iostream>
11a3d14a1562 patch of-struct and of-database iostreams when using dev octave (Bug #54165)
John Donoghue
parents: 4728
diff changeset
127 #include "error-helpers.h"
11a3d14a1562 patch of-struct and of-database iostreams when using dev octave (Bug #54165)
John Donoghue
parents: 4728
diff changeset
128
11a3d14a1562 patch of-struct and of-database iostreams when using dev octave (Bug #54165)
John Donoghue
parents: 4728
diff changeset
129 // call verror