Mercurial > mxe-octave

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