Mercurial > octave

changeset 30656:b15e026c5a31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author John W. Eaton <jwe@octave.org>
date Tue, 18 Jan 2022 13:28:01 -0500
parents af2a0dbfc8fa (current diff) ac74380e9d46 (diff)
children 2434363ba336
files
diffstat 2 files changed, 1 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/data.h	Mon Jan 17 19:33:06 2022 +0100
+++ b/libinterp/corefcn/data.h	Tue Jan 18 13:28:01 2022 -0500
@@ -43,7 +43,7 @@
 
 #if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS)
 OCTAVE_DEPRECATED (7, "use 'octave::do_class_concat' instead")
-extern OCTINTERP_API octave_value
+inline OCTINTERP_API octave_value
 do_class_concat (const octave_value_list& ovl, const std::string& cattype,
                  int dim)
 {
--- a/libinterp/mk-builtins.pl	Mon Jan 17 19:33:06 2022 +0100
+++ b/libinterp/mk-builtins.pl	Tue Jan 18 13:28:01 2022 -0500
@@ -152,18 +152,6 @@
 
   print "\n#if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS)\n\n";
 
-  foreach $name (sort (@method_names))
-  {
-    print "OCTAVE_DEPRECATED (7, \"use 'octave::$name' instead\")
-inline octave_value_list
-$name (octave::interpreter& interp, const octave_value_list& args = octave_value_list (), int nargout = 0)
-{
-  return octave::$name (interp, args, nargout);
-}
-
-";
-  }
-
   foreach $name (sort (@fcn_names))
   {
     print "OCTAVE_DEPRECATED (7, \"use 'octave::$name' instead\")