Mercurial > octave
diff libinterp/octave-value/ov.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 | 4c88a452519c |
children | 18d98ccee2b0 |
line wrap: on
line diff
--- a/libinterp/octave-value/ov.h Sat Aug 14 18:55:37 2021 -0400 +++ b/libinterp/octave-value/ov.h Sat Aug 14 21:50:26 2021 -0400 @@ -45,11 +45,12 @@ #include "oct-time.h" #include "str-vec.h" -namespace octave -{ +OCTAVE_NAMESPACE_BEGIN + class stack_frame; class type_info; -} + +OCTAVE_NAMESPACE_END class Cell; class float_format; @@ -1643,8 +1644,8 @@ // Non-member unary and binary operations on octave_value objects. -namespace octave -{ +OCTAVE_NAMESPACE_BEGIN + extern OCTINTERP_API octave_value unary_op (type_info& ti, octave_value::unary_op op, const octave_value& a); @@ -1692,7 +1693,8 @@ return colon_op (base, octave_value (), limit, is_for_cmd_expr); } -} + +OCTAVE_NAMESPACE_END #if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS) OCTAVE_DEPRECATED (7, "use 'octave::unary_op' instead")