Mercurial > octave
diff libinterp/corefcn/error.cc @ 23584:7ed6b258db91
maint: Deprecate is_map and replace with isstruct.
* ov.h (is_map): Use OCTAVE_DEPRECATED macro around function.
* ov.h (isstruct): New function.
* structdemo.cc, __luinc__.cc, __magick_read__.cc, cellfun.cc, data.cc,
debug.cc, error.cc, graphics.cc, load-save.cc, ls-mat5.cc, mex.cc,
oct-lvalue.h, oct-stream.cc, variables.cc, __eigs__.cc, __ode15__.cc,
ov-base.h, ov-class.cc, ov-class.h, ov-classdef.h, ov-java.h, ov-struct.cc,
ov-struct.h, ov-usr-fcn.cc, ov.h, pt-eval.cc, pt-tm-const.cc:
Replace instances of is_map with isstruct.
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 13 Jun 2017 09:20:08 -0700 |
| parents | 80c42f4cca13 |
| children | 5cb3a2bb5e1e |
line wrap: on
line diff
--- a/libinterp/corefcn/error.cc Tue Jun 13 08:24:42 2017 -0700 +++ b/libinterp/corefcn/error.cc Tue Jun 13 09:20:08 2017 -0700 @@ -1211,7 +1211,7 @@ bool have_fmt = false; - if (nargin == 1 && args(0).is_map ()) + if (nargin == 1 && args(0).isstruct ()) { // empty struct is not an error. return and resume calling function. if (args(0).isempty ()) @@ -1700,7 +1700,7 @@ octave_map old_warning_options = warning_options; - if (arg.is_map ()) + if (arg.isstruct ()) { octave_map m = arg.map_value (); @@ -1878,7 +1878,7 @@ Vlast_error_stack = initialize_last_error_stack (); } - else if (args(0).is_map ()) + else if (args(0).isstruct ()) { octave_scalar_map new_err = args(0).scalar_map_value (); octave_scalar_map new_err_stack;