Mercurial > octave
diff libinterp/corefcn/defun-int.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 | 32c3a5805893 |
children | da1678140f7e |
line wrap: on
line diff
--- a/libinterp/corefcn/defun-int.h Sat Aug 14 18:55:37 2021 -0400 +++ b/libinterp/corefcn/defun-int.h Sat Aug 14 21:50:26 2021 -0400 @@ -36,12 +36,9 @@ class octave_value; -namespace octave -{ - class interpreter; -} +OCTAVE_NAMESPACE_BEGIN -OCTAVE_NAMESPACE_BEGIN +class interpreter; extern OCTINTERP_API void print_usage (void); @@ -67,10 +64,6 @@ // Gets the shlib of the currently executing DLD function, if any. extern OCTINTERP_API dynamic_library get_current_shlib (void); -OCTAVE_NAMESPACE_END - -namespace octave -{ // FIXME: this class doesn't seem to be used in Octave. Is it // really needed? @@ -86,7 +79,8 @@ auto_shlib (const dynamic_library& shl) : dynamic_library (shl) { } }; -} + +OCTAVE_NAMESPACE_END // Some of these functions are widely used, so maybe we should avoid // deprecating them for now?