Mercurial > octave
diff libinterp/corefcn/dasrt.cc @ 29961:7d6709900da7
eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
Files affected: __betainc__.cc, __contourc__.cc, __eigs__.cc,
__expint__.cc, __ftp__.cc, __gammainc__.cc, __ichol__.cc, __ilu__.cc,
__magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, amd.cc, balance.cc,
besselj.cc, bsxfun.cc, call-stack.cc, ccolamd.cc, cellfun.cc, chol.cc,
colamd.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc,
defaults.cc, dirfns.cc, display.cc, dlmread.cc, dmperm.cc, dot.cc,
eig.cc, ellipj.cc, environment.cc, error.cc, event-manager.cc, fft.cc,
fft2.cc, fftn.cc, file-io.cc, find.cc, gcd.cc, getgrent.cc,
getpwent.cc, getrusage.cc, gsvd.cc, hash.cc, help.cc, hess.cc,
hex2num.cc, input.cc, inv.cc, jsondecode.cc, jsonencode.cc,
load-path.cc, load-save.cc, lookup.cc, lsode.cc, lu.cc, max.cc,
mgorth.cc, oct-hist.cc, ordqz.cc, ordschur.cc, pager.cc, pr-output.cc,
psi.cc, qr.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, regexp.cc,
schur.cc, settings.cc, sighandlers.cc, sparse.cc, spparms.cc,
sqrtm.cc, stream-euler.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc,
symbfact.cc, symtab.cc, syscalls.cc, sysdep.cc, time.cc, toplev.cc,
tril.cc, typecast.cc, urlwrite.cc, utils.cc, variables.cc,
__delaunayn__.cc, __fltk_uigetfile__.cc, __glpk__.cc,
__init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audiodevinfo.cc,
audioread.cc, convhulln.cc, fftw.cc, gzip.cc, ov-cell.cc, ov-class.cc,
ov-classdef.cc, ov-fcn-handle.cc, ov-struct.cc, ov-typeinfo.cc,
ov-usr-fcn.cc, octave.cc, lex.ll, oct-parse.yy, profiler.cc,
andpt-eval.cc.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 14 Aug 2021 22:48:52 -0400 |
| parents | 32c3a5805893 |
| children | 796f54d4ddbf |
line wrap: on
line diff
--- a/libinterp/corefcn/dasrt.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/dasrt.cc Sat Aug 14 22:48:52 2021 -0400 @@ -48,6 +48,8 @@ #include "DASRT-opts.cc" +OCTAVE_NAMESPACE_BEGIN + // Global pointers for user defined function required by dasrt. static octave_value dasrt_fcn; static octave_value dasrt_jac; @@ -81,9 +83,9 @@ try { - tmp = octave::feval (dasrt_fcn, args, 1); + tmp = feval (dasrt_fcn, args, 1); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { err_user_supplied_eval (ee, "dasrt"); } @@ -122,9 +124,9 @@ try { - tmp = octave::feval (dasrt_cf, args, 1); + tmp = feval (dasrt_cf, args, 1); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { err_user_supplied_eval (ee, "dasrt"); } @@ -168,9 +170,9 @@ try { - tmp = octave::feval (dasrt_jac, args, 1); + tmp = feval (dasrt_jac, args, 1); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { err_user_supplied_eval (ee, "dasrt"); } @@ -194,8 +196,6 @@ return retval; } -OCTAVE_NAMESPACE_BEGIN - DEFMETHOD (dasrt, interp, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {[@var{x}, @var{xdot}, @var{t_out}, @var{istat}, @var{msg}] =} dasrt (@var{fcn}, @var{g}, @var{x_0}, @var{xdot_0}, @var{t}) @@ -350,7 +350,7 @@ octave_value_list retval (5); - octave::unwind_protect_var<int> restore_var (call_depth); + unwind_protect_var<int> restore_var (call_depth); call_depth++; if (call_depth > 1) @@ -379,13 +379,11 @@ f_arg = c(0); else if (c.numel () == 2) { - dasrt_fcn = octave::get_function_handle (interp, c(0), - fcn_param_names); + dasrt_fcn = get_function_handle (interp, c(0), fcn_param_names); if (dasrt_fcn.is_defined ()) { - dasrt_jac = octave::get_function_handle (interp, c(1), - jac_param_names); + dasrt_jac = get_function_handle (interp, c(1), jac_param_names); if (dasrt_jac.is_undefined ()) dasrt_fcn = octave_value (); @@ -404,21 +402,20 @@ switch (f_arg.rows ()) { case 1: - dasrt_fcn = octave::get_function_handle (interp, f_arg, - fcn_param_names); + dasrt_fcn = get_function_handle (interp, f_arg, fcn_param_names); break; case 2: { string_vector tmp = f_arg.string_vector_value (); - dasrt_fcn = octave::get_function_handle (interp, tmp(0), - fcn_param_names); + dasrt_fcn = get_function_handle (interp, tmp(0), + fcn_param_names); if (dasrt_fcn.is_defined ()) { - dasrt_jac = octave::get_function_handle (interp, tmp(1), - jac_param_names); + dasrt_jac = get_function_handle (interp, tmp(1), + jac_param_names); if (dasrt_jac.is_undefined ()) dasrt_fcn = octave_value (); @@ -453,7 +450,7 @@ { std::list<std::string> cf_param_names ({"x", "t"}); - dasrt_cf = octave::get_function_handle (interp, args(1), cf_param_names); + dasrt_cf = get_function_handle (interp, args(1), cf_param_names); } if (dasrt_cf.is_defined ())