Mercurial > octave
diff libinterp/corefcn/lsode.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 | c4bc77a90fb5 |
line wrap: on
line diff
--- a/libinterp/corefcn/lsode.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/lsode.cc Sat Aug 14 22:48:52 2021 -0400 @@ -287,13 +287,13 @@ warned_fcn_imaginary = false; warned_jac_imaginary = false; - octave::unwind_protect_var<int> restore_var (call_depth); + unwind_protect_var<int> restore_var (call_depth); call_depth++; if (call_depth > 1) error ("lsode: invalid recursive call"); - octave::symbol_table& symtab = interp.get_symbol_table (); + symbol_table& symtab = interp.get_symbol_table (); std::string fcn_name, fname, jac_name, jname; @@ -311,13 +311,11 @@ f_arg = c(0); else if (c.numel () == 2) { - lsode_fcn = octave::get_function_handle (interp, c(0), - parameter_names); + lsode_fcn = get_function_handle (interp, c(0), parameter_names); if (lsode_fcn.is_defined ()) { - lsode_jac = octave::get_function_handle (interp, c(1), - parameter_names); + lsode_jac = get_function_handle (interp, c(1), parameter_names); if (lsode_jac.is_undefined ()) lsode_fcn = octave_value (); @@ -336,21 +334,20 @@ switch (f_arg.rows ()) { case 1: - lsode_fcn = octave::get_function_handle (interp, f_arg, - parameter_names); + lsode_fcn = get_function_handle (interp, f_arg, parameter_names); break; case 2: { string_vector tmp = f_arg.string_vector_value (); - lsode_fcn = octave::get_function_handle (interp, tmp(0), - parameter_names); + lsode_fcn = get_function_handle (interp, tmp(0), + parameter_names); if (lsode_fcn.is_defined ()) { - lsode_jac = octave::get_function_handle (interp, tmp(1), - parameter_names); + lsode_jac = get_function_handle (interp, tmp(1), + parameter_names); if (lsode_jac.is_undefined ()) lsode_fcn = octave_value ();