Mercurial > mxe-octave

comparison src/of-struct-1-fixes.patch @ 4653:00e61c4a5657

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes for package build errors due to API changes
author John W. Eaton <jwe@octave.org>
date Mon, 09 Apr 2018 12:12:44 -0400
parents
children
comparison
equal deleted inserted replaced
4652:2f14bc0c6d0c 4653:00e61c4a5657
1 diff -uNr a/src/error-helpers.cc b/src/error-helpers.cc
2 --- a/src/error-helpers.cc 2016-09-18 12:09:18.000000000 -0400
3 +++ b/src/error-helpers.cc 2018-04-09 13:00:47.302704176 -0400
4 @@ -24,7 +24,7 @@
5 // call verror
6 #ifdef HAVE_OCTAVE_VERROR_ARG_EXC
7 void
8 -c_verror (octave_execution_exception& e, const char *fmt, ...)
9 +c_verror (octave::execution_exception& e, const char *fmt, ...)
10 {
11 va_list args;
12 va_start (args, fmt);
13 @@ -33,7 +33,7 @@
14 }
15 #else
16 void
17 -c_verror (const octave_execution_exception&, const char *fmt, ...)
18 +c_verror (const octave::execution_exception&, const char *fmt, ...)
19 {
20 va_list args;
21 va_start (args, fmt);
22 diff -uNr a/src/error-helpers.h b/src/error-helpers.h
23 --- a/src/error-helpers.h 2016-09-18 12:09:18.000000000 -0400
24 +++ b/src/error-helpers.h 2018-04-09 13:01:12.285532698 -0400
25 @@ -21,9 +21,9 @@
26
27 // call verror
28 #ifdef HAVE_OCTAVE_VERROR_ARG_EXC
29 -void c_verror (octave_execution_exception&, const char *, ...);
30 +void c_verror (octave::execution_exception&, const char *, ...);
31 #else
32 -void c_verror (const octave_execution_exception&, const char *, ...);
33 +void c_verror (const octave::execution_exception&, const char *, ...);
34 #endif
35
36 // call verror
37 @@ -33,7 +33,7 @@
38 // both if Octave uses exceptions for errors and if it still uses
39 // error_state. In the latter case return 'retval'.
40 #ifdef HAVE_OCTAVE_ERROR_STATE
41 - // can throw octave_execution_exception despite of this
42 + // can throw octave::execution_exception despite of this
43 #define CHECK_ERROR(code, retval, ...) \
44 try \
45 { \
46 @@ -46,7 +46,7 @@
47 return retval; \
48 } \
49 } \
50 - catch (octave_execution_exception& e) \
51 + catch (octave::execution_exception& e) \
52 { \
53 c_verror (e, __VA_ARGS__); \
54 \
55 @@ -58,7 +58,7 @@
56 { \
57 code ; \
58 } \
59 - catch (octave_execution_exception& e) \
60 + catch (octave::execution_exception& e) \
61 { \
62 c_verror (e, __VA_ARGS__); \
63 \
64 @@ -70,7 +70,7 @@
65 // Octave doesn't throw exceptions for errors but still uses
66 // error_state.
67 #ifdef HAVE_OCTAVE_ERROR_STATE
68 - // can throw octave_execution_exception despite of this
69 + // can throw octave::execution_exception despite of this
70 #define CHECK_ERROR_EXIT1(code, ...) \
71 try \
72 { \
73 @@ -83,7 +83,7 @@
74 exit (1); \
75 } \
76 } \
77 - catch (octave_execution_exception& e) \
78 + catch (octave::execution_exception& e) \
79 { \
80 c_verror (e, __VA_ARGS__); \
81 \
82 @@ -95,7 +95,7 @@
83 { \
84 code ; \
85 } \
86 - catch (octave_execution_exception& e) \
87 + catch (octave::execution_exception& e) \
88 { \
89 c_verror (e, __VA_ARGS__); \
90 \
91 @@ -107,7 +107,7 @@
92 // Octave uses exceptions for errors and if it still uses
93 // error_state. In the latter case reset error_state to 0.
94 #ifdef HAVE_OCTAVE_ERROR_STATE
95 - // can throw octave_execution_exception despite of this
96 + // can throw octave::execution_exception despite of this
97 #define SET_ERR(code, err) \
98 err = false; \
99 \
100 @@ -120,7 +120,7 @@
101 err = true; \
102 } \
103 } \
104 - catch (octave_execution_exception&) \
105 + catch (octave::execution_exception&) \
106 { \
107 err = true; \
108 }
109 @@ -130,7 +130,7 @@
110 { \
111 code ; \
112 } \
113 - catch (octave_execution_exception&) \
114 + catch (octave::execution_exception&) \
115 { \
116 err = true; \
117 }