Mercurial > octave

diff libinterp/corefcn/quad.cc @ 31730:610a85b0ff62

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use interpreter::feval instead of global feval function * __eigs__.cc, bsxfun.cc, call-stack.cc, cellfun.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, defun.cc, gh-manager.cc, graphics.cc, gtk-manager.cc, gtk-manager.h, hook-fcn.cc, input.cc, interpreter.cc, ls-mat5.cc, lsode.cc, mex.cc, pr-output.cc, quad.cc, quadcc.cc, variables.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, audiodevinfo.cc, cdef-method.cc, cdef-package.cc, cdef-property.cc, ov-class.cc, ov-java.cc, ov-oncleanup.cc, op-class.cc, pt-assign.cc, pt-eval.cc, pt-id.cc: Change all uses of global feval function to use interpreter::feval instead. If necessary, use __get_interpreter__ to access global interpreter object.
author John W. Eaton <jwe@octave.org>
date Thu, 12 Jan 2023 10:22:04 -0500
parents 597f3ee61a48
children 2e484f9f1f18
line wrap: on
line diff
--- a/libinterp/corefcn/quad.cc	Thu Jan 12 08:40:45 2023 -0500
+++ b/libinterp/corefcn/quad.cc	Thu Jan 12 10:22:04 2023 -0500
@@ -36,8 +36,8 @@
 #include "error.h"
 #include "errwarn.h"
 #include "interpreter-private.h"
+#include "interpreter.h"
 #include "pager.h"
-#include "parse.h"
 #include "ov.h"
 #include "ovl.h"
 #include "unwind-prot.h"
@@ -71,7 +71,9 @@
 
       try
         {
-          tmp = feval (quad_fcn, args, 1);
+          interpreter& interp = __get_interpreter__ ();
+
+          tmp = interp.feval (quad_fcn, args, 1);
         }
       catch (execution_exception& ee)
         {
@@ -107,7 +109,9 @@
 
       try
         {
-          tmp = feval (quad_fcn, args, 1);
+          interpreter& interp = __get_interpreter__ ();
+
+          tmp = interp.feval (quad_fcn, args, 1);
         }
       catch (execution_exception& ee)
         {