comparison liboctave/util/lo-array-gripes.h @ 21134:2e5c1f766ac9

provide replacement hints for deprecated C++ functions * oct-conf-post.in.h (OCTAVE_DEPRECATED): Accept message argument. * error.h, errwarn.h, gripes.h, symtab.h, variables.h, * ov-base-sparse.h, ov-base.h, ov.h, Array.h, DiagArray2.h, * PermMatrix.h, Range.h, Sparse.h, dSparse.h, lo-array-errwarn.h, * lo-array-gripes.h, unwind-prot.h: Change all uses of OCTAVE_DEPRECATED.
author John W. Eaton <jwe@octave.org>
date Fri, 22 Jan 2016 12:15:12 -0500
parents 2e8aea678f2a
children 1473547f50f5
comparison
equal deleted inserted replaced
21133:31674b9d202b 21134:2e5c1f766ac9
27 27
28 #include "lo-array-errwarn.h" 28 #include "lo-array-errwarn.h"
29 #include "dim-vector.h" 29 #include "dim-vector.h"
30 #include "quit.h" 30 #include "quit.h"
31 31
32 OCTAVE_DEPRECATED OCTAVE_NORETURN OCTAVE_API extern void 32 OCTAVE_DEPRECATED ("use 'err_nan_to_logical_conversion' instead")
33 OCTAVE_NORETURN OCTAVE_API extern void
33 gripe_nan_to_logical_conversion (void); 34 gripe_nan_to_logical_conversion (void);
34 35
35 OCTAVE_DEPRECATED OCTAVE_NORETURN OCTAVE_API extern void 36 OCTAVE_DEPRECATED ("use 'err_nan_to_character_conversion' instead")
37 OCTAVE_NORETURN OCTAVE_API extern void
36 gripe_nan_to_character_conversion (void); 38 gripe_nan_to_character_conversion (void);
37 39
38 OCTAVE_DEPRECATED OCTAVE_NORETURN OCTAVE_API extern void 40 OCTAVE_DEPRECATED ("use 'err_nonconformant' instead")
41 OCTAVE_NORETURN OCTAVE_API extern void
39 gripe_nonconformant (const char *op, 42 gripe_nonconformant (const char *op,
40 octave_idx_type op1_len, 43 octave_idx_type op1_len,
41 octave_idx_type op2_len); 44 octave_idx_type op2_len);
42 45
43 OCTAVE_DEPRECATED OCTAVE_NORETURN OCTAVE_API extern void 46 OCTAVE_DEPRECATED ("use 'err_nonconformant' instead")
47 OCTAVE_NORETURN OCTAVE_API extern void
44 gripe_nonconformant (const char *op, 48 gripe_nonconformant (const char *op,
45 octave_idx_type op1_nr, octave_idx_type op1_nc, 49 octave_idx_type op1_nr, octave_idx_type op1_nc,
46 octave_idx_type op2_nr, octave_idx_type op2_nc); 50 octave_idx_type op2_nr, octave_idx_type op2_nc);
47 51
48 52
49 OCTAVE_DEPRECATED OCTAVE_NORETURN OCTAVE_API extern void 53 OCTAVE_DEPRECATED ("use 'err_nonconformant' instead")
54 OCTAVE_NORETURN OCTAVE_API extern void
50 gripe_nonconformant (const char *op, const dim_vector& op1_dims, 55 gripe_nonconformant (const char *op, const dim_vector& op1_dims,
51 const dim_vector& op2_dims); 56 const dim_vector& op2_dims);
52 57
53 OCTAVE_DEPRECATED OCTAVE_NORETURN OCTAVE_API extern void 58 OCTAVE_DEPRECATED ("use 'err_index_out_of_range' instead")
59 OCTAVE_NORETURN OCTAVE_API extern void
54 gripe_index_out_of_range (int nd, int dim, 60 gripe_index_out_of_range (int nd, int dim,
55 octave_idx_type iext, octave_idx_type ext, 61 octave_idx_type iext, octave_idx_type ext,
56 const dim_vector& d); 62 const dim_vector& d);
57 63
58 OCTAVE_DEPRECATED OCTAVE_NORETURN OCTAVE_API extern void 64 OCTAVE_DEPRECATED ("use 'err_index_out_of_range' instead")
65 OCTAVE_NORETURN OCTAVE_API extern void
59 gripe_index_out_of_range (int nd, int dim, 66 gripe_index_out_of_range (int nd, int dim,
60 octave_idx_type iext, octave_idx_type ext); 67 octave_idx_type iext, octave_idx_type ext);
61 68
62 OCTAVE_DEPRECATED OCTAVE_NORETURN OCTAVE_API extern void 69 OCTAVE_DEPRECATED ("use 'err_del_index_out_of_range' instead")
70 OCTAVE_NORETURN OCTAVE_API extern void
63 gripe_del_index_out_of_range (bool is1d, octave_idx_type iext, 71 gripe_del_index_out_of_range (bool is1d, octave_idx_type iext,
64 octave_idx_type ext); 72 octave_idx_type ext);
65 73
66 OCTAVE_DEPRECATED OCTAVE_NORETURN OCTAVE_API extern void 74 OCTAVE_DEPRECATED ("use 'err_invalid_index' instead")
75 OCTAVE_NORETURN OCTAVE_API extern void
67 gripe_invalid_index (double, octave_idx_type nd = 0, 76 gripe_invalid_index (double, octave_idx_type nd = 0,
68 octave_idx_type dim = 0, 77 octave_idx_type dim = 0,
69 const std::string& var = ""); 78 const std::string& var = "");
70 79
71 OCTAVE_DEPRECATED OCTAVE_NORETURN OCTAVE_API extern void 80 OCTAVE_DEPRECATED ("use 'err_invalid_index' instead")
81 OCTAVE_NORETURN OCTAVE_API extern void
72 gripe_invalid_index (octave_idx_type n, octave_idx_type nd = 0, 82 gripe_invalid_index (octave_idx_type n, octave_idx_type nd = 0,
73 octave_idx_type dim = 0, 83 octave_idx_type dim = 0,
74 const std::string& var = ""); 84 const std::string& var = "");
75 85
76 OCTAVE_DEPRECATED OCTAVE_NORETURN OCTAVE_API extern void 86 OCTAVE_DEPRECATED ("use 'err_invalid_index' instead")
87 OCTAVE_NORETURN OCTAVE_API extern void
77 gripe_invalid_index (const std::string& idx, octave_idx_type nd = 0, 88 gripe_invalid_index (const std::string& idx, octave_idx_type nd = 0,
78 octave_idx_type dim = 0, 89 octave_idx_type dim = 0,
79 const std::string& var = ""); 90 const std::string& var = "");
80 91
81 OCTAVE_DEPRECATED OCTAVE_NORETURN OCTAVE_API extern void 92 OCTAVE_DEPRECATED ("use 'err_invalid_resize' instead")
93 OCTAVE_NORETURN OCTAVE_API extern void
82 gripe_invalid_resize (void); 94 gripe_invalid_resize (void);
83 95
84 OCTAVE_DEPRECATED OCTAVE_API extern 96 OCTAVE_DEPRECATED ("use 'err_singular_matrix' instead")
85 void gripe_singular_matrix (double rcond = 0.0); 97 OCTAVE_API extern void
98 gripe_singular_matrix (double rcond = 0.0);
86 99
87 #endif 100 #endif