Mercurial > octave

diff libinterp/corefcn/error.cc @ 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 3a2c354a52c2 e88a07dec498
children 23664317f0d3
line wrap: on
line diff
--- a/libinterp/corefcn/error.cc	Thu Dec 01 14:01:16 2022 -0800
+++ b/libinterp/corefcn/error.cc	Thu Dec 01 14:28:07 2022 -0800
@@ -233,7 +233,7 @@
   return have_fmt;
 }
 
-OCTAVE_NAMESPACE_BEGIN
+OCTAVE_BEGIN_NAMESPACE(octave)
 
   static octave_scalar_map
   init_warning_options (const std::string& state)
@@ -916,7 +916,7 @@
     evmgr.display_exception (ee, m_beep_on_error);
   }
 
-OCTAVE_NAMESPACE_END
+OCTAVE_END_NAMESPACE(octave)
 
 void
 vmessage (const char *name, const char *fmt, va_list args)
@@ -1112,7 +1112,7 @@
   va_end (args);
 }
 
-OCTAVE_NAMESPACE_BEGIN
+OCTAVE_BEGIN_NAMESPACE(octave)
 
 void
 defun_usage_message (const std::string& msg)
@@ -2166,4 +2166,4 @@
   es.interpreter_try (frame);
 }
 
-OCTAVE_NAMESPACE_END
+OCTAVE_END_NAMESPACE(octave)