diff libinterp/corefcn/sysdep.cc @ 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 32c3a5805893
children 7d6709900da7
line wrap: on
line diff
--- a/libinterp/corefcn/sysdep.cc	Sat Aug 14 18:55:37 2021 -0400
+++ b/libinterp/corefcn/sysdep.cc	Sat Aug 14 21:50:26 2021 -0400
@@ -103,8 +103,8 @@
 
 #endif
 
-namespace octave
-{
+OCTAVE_NAMESPACE_BEGIN
+
 #if defined (__386BSD__) || defined (__FreeBSD__) || defined (__NetBSD__)
 
   static void
@@ -188,9 +188,6 @@
 
 #endif
   }
-}
-
-OCTAVE_NAMESPACE_BEGIN
 
 DEFUN (__open_with_system_app__, args, ,
        doc: /* -*- texinfo -*-
@@ -363,10 +360,6 @@
 #endif
 }
 
-OCTAVE_NAMESPACE_END
-
-namespace octave
-{
 #if defined (__MINGW32__)
 
   static void
@@ -807,9 +800,6 @@
 
 #endif
   }
-}
-
-OCTAVE_NAMESPACE_BEGIN
 
 DEFUN (clc, , ,
        doc: /* -*- texinfo -*-
@@ -915,12 +905,8 @@
 ## Test for unsetenv is in setenv test
 */
 
-OCTAVE_NAMESPACE_END
-
 #if defined (OCTAVE_USE_WINDOWS_API)
 
-namespace octave
-{
   static void
   reg_close_key_wrapper (HKEY key)
   {
@@ -1006,12 +992,9 @@
 
     return retval;
   }
-}
 
 #endif
 
-OCTAVE_NAMESPACE_BEGIN
-
 DEFUN (winqueryreg, args, ,
        doc: /* -*- texinfo -*-
 @deftypefn  {} {@var{value} =} winqueryreg (@var{rootkey}, @var{subkey}, @var{valuename})