Mercurial > octave

diff libinterp/mk-builtins.pl @ 31606:dfa5d9c3ae72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default
author Rik <rik@octave.org>
date Thu, 01 Dec 2022 14:28:07 -0800
parents fcbbb498d4af e88a07dec498
children 5f11de0e7440
line wrap: on
line diff
--- a/libinterp/mk-builtins.pl	Thu Dec 01 14:01:16 2022 -0800
+++ b/libinterp/mk-builtins.pl	Thu Dec 01 14:28:07 2022 -0800
@@ -116,7 +116,7 @@
 
 #include \"ovl.h\"
 
-OCTAVE_NAMESPACE_BEGIN
+OCTAVE_BEGIN_NAMESPACE(octave)
 
 class interpreter;
 
@@ -148,7 +148,7 @@
 ";
   }
 
-  print "\nOCTAVE_NAMESPACE_END\n";
+  print "\nOCTAVE_END_NAMESPACE(octave)\n";
 
   print "\n#endif\n";
 }
@@ -166,8 +166,9 @@
 #include \"symtab.h\"
 #include \"variables.h\"
 
-namespace octave
-{";
+OCTAVE_BEGIN_NAMESPACE(octave)
+
+";
 
   @installer_functions = ();
 
@@ -305,5 +306,6 @@
     print "    $fcn (*this);\n"
   }
 
-  print "  }\n}\n";
+  print "  }\n";
+  print "OCTAVE_END_NAMESPACE(octave)\n";
 }