Mercurial > octave

diff libinterp/octave-value/ov-java.cc @ 29960:939bef0b66e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 65c609504036
line wrap: on
line diff
--- a/libinterp/octave-value/ov-java.cc	Sat Aug 14 18:55:37 2021 -0400
+++ b/libinterp/octave-value/ov-java.cc	Sat Aug 14 21:50:26 2021 -0400
@@ -223,8 +223,8 @@
 bool Vjava_unsigned_autoconversion = true;
 bool Vdebug_java = false;
 
-namespace octave
-{
+OCTAVE_NAMESPACE_BEGIN
+
   class JVMArgs
   {
   public:
@@ -317,8 +317,8 @@
 
     std::list<std::string> java_opts;
   };
-}
-
+
+OCTAVE_NAMESPACE_END
 
 //! The java initialization directory is given by the environment variable
 //! @c OCTAVE_JAVA_DIR if defined; otherwise it is the directory of Octave's
@@ -400,7 +400,6 @@
   return (classpath);
 }
 
-
 //! Return the initial classpath.
 //!
 //! The initial classpath starts with a pointer to @c octave.jar which is
@@ -535,13 +534,10 @@
 
 #if defined (OCTAVE_USE_WINDOWS_API)
 
-namespace octave
-{
   // Declare function defined in sysdep.cc
   extern LONG
   get_regkey_value (HKEY h_rootkey, const std::string subkey,
                     const std::string name, octave_value& value);
-}
 
 static std::string
 get_jvm_lib_path_from_registry ()
@@ -643,7 +639,6 @@
 }
 #endif
 
-
 //! Initialize the java virtual machine (jvm) and field #jvm if necessary.
 //!
 //! If the jvm exists and is initialized, #jvm points to it, i.e. is not 0