diff libinterp/corefcn/error.h @ 29960:939bef0b66e0

merge "namespace octave" and OCTAVE_NAMESPACE_BEGIN/END blocks In files with both OCTAVE_NAMESPACE_BEGIN/END and "namespace octave" blocks, merge adjacent blocks. Use the macros in place of "namespace octave" in affected files and the corresponding header files. Files affected: call-stack.cc, call-stack.h, defaults.cc, defaults.h, defun-int.h, display.cc, display.h, environment.cc, environment.h, error.cc, error.h, event-manager.cc, event-manager.h, fcn-info.cc, fcn-info.h, help.cc, help.h, input.cc, input.h, interpreter.cc, interpreter.h, load-path.cc, load-path.h, load-save.cc, load-save.h, oct-hist.cc, oct-hist.h, pager.cc, pager.h, settings.cc, settings.h, sighandlers.cc, sighandlers.h, symtab.cc, symtab.h, sysdep.cc, sysdep.h, utils.cc, utils.h, __ode15__.cc, gzip.cc, ov-fcn-handle.cc, ov-fcn-handle.h, ov-java.cc, ov-java.h, ov-typeinfo.cc, ov-typeinfo.h, ov.cc, ov.h, octave.cc, octave.h, lex.ll, oct-parse.yy, profiler.cc, profiler.h, pt-eval.cc, and pt-eval.h.
author John W. Eaton <jwe@octave.org>
date Sat, 14 Aug 2021 21:50:26 -0400
parents a956ca6698d2
children c44c72cc68a0
line wrap: on
line diff
--- a/libinterp/corefcn/error.h	Sat Aug 14 18:55:37 2021 -0400
+++ b/libinterp/corefcn/error.h	Sat Aug 14 21:50:26 2021 -0400
@@ -37,13 +37,11 @@
 #include "oct-map.h"
 
 class octave_value_list;
-namespace octave
-{
-  class execution_exception;
-}
+
+OCTAVE_NAMESPACE_BEGIN
 
-namespace octave
-{
+class execution_exception;
+
   class error_system
   {
   public:
@@ -401,7 +399,8 @@
     //! The last file in which an error occurred.
     octave_map m_last_error_stack;
   };
-}
+
+OCTAVE_NAMESPACE_END
 
 // FIXME: should we move the following functions inside the octave
 // namespace?  If so, should the functions outside of the namespace be