Mercurial > jwe > octave
changeset 21111:7bb96a8df912
lo-array-errwarn.h: Don't export string constants unnecessarily.
* lo-array-errwarn.h: Delete "extern const char * [error|warning]_id_XXX"
declarations.
* ov-complex.cc (complex_index_exception::err_id): Use string literal rather
than error_id_invalid_index constant from lo-array-errwarn.h.
* lo-array-errwarn.cc: Declare and initialize
"static const char * [error_warning]_id_XXX]" variables.
* lo-array-gripes.cc: Declare and initialize
"static const char * [error_warning]_id_XXX]" variables.
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 19 Jan 2016 15:08:59 -0800 |
| parents | 3d0d84305600 |
| children | 358aa7fcbd33 |
| files | libinterp/octave-value/ov-complex.cc liboctave/util/lo-array-errwarn.cc liboctave/util/lo-array-errwarn.h liboctave/util/lo-array-gripes.cc |
| diffstat | 4 files changed, 18 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-complex.cc Tue Jan 19 14:09:56 2016 -0800 +++ b/libinterp/octave-value/ov-complex.cc Tue Jan 19 15:08:59 2016 -0800 @@ -75,7 +75,7 @@ // ID of error to throw. const char *err_id (void) const { - return error_id_invalid_index; + return "Octave:invalid-index"; } };
--- a/liboctave/util/lo-array-errwarn.cc Tue Jan 19 14:09:56 2016 -0800 +++ b/liboctave/util/lo-array-errwarn.cc Tue Jan 19 15:08:59 2016 -0800 @@ -29,15 +29,16 @@ #include "lo-array-errwarn.h" #include "lo-error.h" -const char *error_id_nonconformant_args = "Octave:nonconformant-args"; +// Text constants used to shorten code below. +static const char *error_id_nonconformant_args = "Octave:nonconformant-args"; -const char *error_id_index_out_of_bounds = "Octave:index-out-of-bounds"; +static const char *error_id_index_out_of_bounds = "Octave:index-out-of-bounds"; -const char *error_id_invalid_index = "Octave:invalid-index"; +static const char *error_id_invalid_index = "Octave:invalid-index"; -const char *warning_id_nearly_singular_matrix = "Octave:nearly-singular-matrix"; +static const char *warning_id_nearly_singular_matrix = "Octave:nearly-singular-matrix"; -const char *warning_id_singular_matrix = "Octave:singular-matrix"; +static const char *warning_id_singular_matrix = "Octave:singular-matrix"; void err_nan_to_logical_conversion (void)
--- a/liboctave/util/lo-array-errwarn.h Tue Jan 19 14:09:56 2016 -0800 +++ b/liboctave/util/lo-array-errwarn.h Tue Jan 19 15:08:59 2016 -0800 @@ -99,16 +99,6 @@ }; -extern OCTAVE_API const char *error_id_nonconformant_args; - -extern OCTAVE_API const char *error_id_index_out_of_bounds; - -extern OCTAVE_API const char *error_id_invalid_index; - -extern OCTAVE_API const char *warning_id_nearly_singular_matrix; - -extern OCTAVE_API const char *warning_id_singular_matrix; - OCTAVE_NORETURN OCTAVE_API extern void err_nan_to_logical_conversion (void);
--- a/liboctave/util/lo-array-gripes.cc Tue Jan 19 14:09:56 2016 -0800 +++ b/liboctave/util/lo-array-gripes.cc Tue Jan 19 15:08:59 2016 -0800 @@ -32,6 +32,17 @@ #include "lo-array-gripes.h" #include "lo-error.h" +// Text constants used to shorten code below. +static const char *error_id_nonconformant_args = "Octave:nonconformant-args"; + +static const char *error_id_index_out_of_bounds = "Octave:index-out-of-bounds"; + +static const char *error_id_invalid_index = "Octave:invalid-index"; + +static const char *warning_id_nearly_singular_matrix = "Octave:nearly-singular-matrix"; + +static const char *warning_id_singular_matrix = "Octave:singular-matrix"; + void gripe_nan_to_logical_conversion (void) {