Mercurial > octave

changeset 24728:af11cc7cd336

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use DEFMETHODX instead of undefining quad * quad.cc: Don't #undef quad. (Fquad): Use DEFMETHODX. * mk-builtins.pl: Don't emit code to undefine quad.
author John W. Eaton <jwe@octave.org>
date Sat, 10 Feb 2018 16:06:16 -0500
parents 11e359eb63f4
children 22e60ef42640
files libinterp/corefcn/quad.cc libinterp/mk-builtins.pl
diffstat 2 files changed, 2 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/quad.cc	Sat Feb 10 16:03:27 2018 -0500
+++ b/libinterp/corefcn/quad.cc	Sat Feb 10 16:06:16 2018 -0500
@@ -45,10 +45,6 @@
 
 #include "Quad-opts.cc"
 
-#if defined (quad)
-#  undef quad
-#endif
-
 // Global pointer for user defined function required by quadrature functions.
 static octave_function *quad_fcn;
 
@@ -130,8 +126,8 @@
   return retval;
 }
 
-DEFMETHOD (quad, interp, args, ,
-           doc: /* -*- texinfo -*-
+DEFMETHODX ("quad", Fquad, interp, args, ,
+            doc: /* -*- texinfo -*-
 @deftypefn  {} {@var{q} =} quad (@var{f}, @var{a}, @var{b})
 @deftypefnx {} {@var{q} =} quad (@var{f}, @var{a}, @var{b}, @var{tol})
 @deftypefnx {} {@var{q} =} quad (@var{f}, @var{a}, @var{b}, @var{tol}, @var{sing})
--- a/libinterp/mk-builtins.pl	Sat Feb 10 16:03:27 2018 -0500
+++ b/libinterp/mk-builtins.pl	Sat Feb 10 16:06:16 2018 -0500
@@ -154,10 +154,6 @@
 #include \"symtab.h\"
 #include \"variables.h\"
 
-#if defined (quad)
-#  undef quad
-#endif
-
 namespace octave
 {";