Mercurial > octave

diff libinterp/corefcn/variables.h @ 31606:dfa5d9c3ae72
maint: merge stable to default
author: Rik <rik@octave.org>
date: Thu, 01 Dec 2022 14:28:07 -0800
parents: 9a0ce9eea1b7 e88a07dec498
children: 23664317f0d3
--- a/libinterp/corefcn/variables.h	Thu Dec 01 14:01:16 2022 -0800
+++ b/libinterp/corefcn/variables.h	Thu Dec 01 14:28:07 2022 -0800
@@ -36,10 +36,11 @@
 class octave_builtin;
 class string_vector;
 
-namespace octave
-{
+OCTAVE_BEGIN_NAMESPACE(octave)
+
   class tree_identifier;
-}
+
+OCTAVE_END_NAMESPACE(octave)
 
 #include <limits>
 #include <string>
@@ -61,7 +62,7 @@
 is_valid_function (const std::string&, const std::string& = "",
                    bool warn = false);
 
-OCTAVE_NAMESPACE_BEGIN
+OCTAVE_BEGIN_NAMESPACE(octave)
 
 extern OCTINTERP_API int
 symbol_exist (const std::string& name, const std::string& type = "any");
@@ -104,7 +105,7 @@
 extern OCTINTERP_API std::string
 maybe_missing_function_hook (const std::string& name);
 
-OCTAVE_NAMESPACE_END
+OCTAVE_END_NAMESPACE(octave)
 
 // The following macros should also be considered obsolete.