comparison liboctave/util/lo-array-errwarn.cc @ 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 e39e05d90788
children 358aa7fcbd33
comparison
equal deleted inserted replaced
21110:3d0d84305600 21111:7bb96a8df912
27 #include <sstream> 27 #include <sstream>
28 28
29 #include "lo-array-errwarn.h" 29 #include "lo-array-errwarn.h"
30 #include "lo-error.h" 30 #include "lo-error.h"
31 31
32 const char *error_id_nonconformant_args = "Octave:nonconformant-args"; 32 // Text constants used to shorten code below.
33 33 static const char *error_id_nonconformant_args = "Octave:nonconformant-args";
34 const char *error_id_index_out_of_bounds = "Octave:index-out-of-bounds"; 34
35 35 static const char *error_id_index_out_of_bounds = "Octave:index-out-of-bounds";
36 const char *error_id_invalid_index = "Octave:invalid-index"; 36
37 37 static const char *error_id_invalid_index = "Octave:invalid-index";
38 const char *warning_id_nearly_singular_matrix = "Octave:nearly-singular-matrix"; 38
39 39 static const char *warning_id_nearly_singular_matrix = "Octave:nearly-singular-matrix";
40 const char *warning_id_singular_matrix = "Octave:singular-matrix"; 40
41 static const char *warning_id_singular_matrix = "Octave:singular-matrix";
41 42
42 void 43 void
43 err_nan_to_logical_conversion (void) 44 err_nan_to_logical_conversion (void)
44 { 45 {
45 (*current_liboctave_error_handler) 46 (*current_liboctave_error_handler)