# HG changeset patch # User Rik # Date 1669933687 28800 # Node ID dfa5d9c3ae722c926638d210f1eb0766c453ded6 # Parent 9ecc95d840ca382fb8245890dc1112cfd2d60419# Parent e88a07dec498860fb98f141e22e62e1cd7571740 maint: merge stable to default diff -r 9ecc95d840ca -r dfa5d9c3ae72 build-aux/mk-opts.pl --- a/build-aux/mk-opts.pl Thu Dec 01 14:01:16 2022 -0800 +++ b/build-aux/mk-opts.pl Thu Dec 01 14:28:07 2022 -0800 @@ -913,7 +913,7 @@ sub emit_options_function { print <<"_END_EMIT_OPTIONS_FUNCTION_HDR_"; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN ($OPT_FCN_NAME, args, , doc: /* -*- texinfo -*- @@ -962,7 +962,7 @@ return retval; } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) _END_EMIT_OPTIONS_FUNCTION_BODY_ diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/build-env.h --- a/libinterp/build-env.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/build-env.h Thu Dec 01 14:28:07 2022 -0800 @@ -30,10 +30,10 @@ #include "oct-map.h" -namespace octave -{ - namespace build_env - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(build_env) + extern OCTINTERP_API octave_scalar_map features (void); extern OCTINTERP_API const char *AMD_CPPFLAGS; @@ -176,7 +176,8 @@ extern OCTINTERP_API const char *Z_LDFLAGS; extern OCTINTERP_API const char *Z_LIBS; extern OCTINTERP_API const char *config_opts; - } -} + +OCTAVE_END_NAMESPACE(build_env) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/build-env.in.cc --- a/libinterp/build-env.in.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/build-env.in.cc Thu Dec 01 14:28:07 2022 -0800 @@ -31,10 +31,10 @@ #include "build-env.h" -namespace octave -{ - namespace build_env - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(build_env) + const char *AMD_CPPFLAGS = %OCTAVE_CONF_AMD_CPPFLAGS%; const char *AMD_LDFLAGS = %OCTAVE_CONF_AMD_LDFLAGS%; @@ -314,5 +314,6 @@ const char *Z_LIBS = %OCTAVE_CONF_Z_LIBS%; const char *config_opts = %OCTAVE_CONF_config_opts%; - } -} + +OCTAVE_END_NAMESPACE(build_env) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/__betainc__.cc --- a/libinterp/corefcn/__betainc__.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/__betainc__.cc Thu Dec 01 14:28:07 2022 -0800 @@ -31,8 +31,7 @@ #include "dNDArray.h" #include "fNDArray.h" -OCTAVE_NAMESPACE_BEGIN - +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (__betainc__, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{y} =} __betainc__ (@var{x}, @var{a}, @var{b}) @@ -203,4 +202,4 @@ return retval; } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/__contourc__.cc --- a/libinterp/corefcn/__contourc__.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/__contourc__.cc Thu Dec 01 14:28:07 2022 -0800 @@ -46,7 +46,7 @@ #include "defun.h" #include "ov.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // FIXME: this looks like trouble... static Matrix this_contour; @@ -327,4 +327,4 @@ %!assert (1) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/__dsearchn__.cc --- a/libinterp/corefcn/__dsearchn__.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/__dsearchn__.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "error.h" #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (__dsearchn__, args, , doc: /* -*- texinfo -*- @@ -103,4 +103,4 @@ %!assert (1) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/__eigs__.cc --- a/libinterp/corefcn/__eigs__.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/__eigs__.cc Thu Dec 01 14:28:07 2022 -0800 @@ -45,7 +45,7 @@ #include "parse.h" #include "variables.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) #if defined (HAVE_ARPACK) @@ -707,4 +707,4 @@ %!assert (1) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/__expint__.cc --- a/libinterp/corefcn/__expint__.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/__expint__.cc Thu Dec 01 14:28:07 2022 -0800 @@ -31,7 +31,7 @@ #include "defun.h" #include "fCNDArray.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (__expint__, args, , doc: /* -*- texinfo -*- @@ -173,4 +173,4 @@ return retval; } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/__ftp__.cc --- a/libinterp/corefcn/__ftp__.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/__ftp__.cc Thu Dec 01 14:28:07 2022 -0800 @@ -52,7 +52,7 @@ #include "unwind-prot.h" #include "url-handle-manager.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFMETHOD (__ftp__, interp, args, , doc: /* -*- texinfo -*- @@ -477,4 +477,4 @@ return ovl (); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/__gammainc__.cc --- a/libinterp/corefcn/__gammainc__.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/__gammainc__.cc Thu Dec 01 14:28:07 2022 -0800 @@ -30,7 +30,7 @@ #include "defun.h" #include "fNDArray.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (__gammainc__, args, , doc: /* -*- texinfo -*- @@ -167,4 +167,4 @@ return retval; } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/__ichol__.cc --- a/libinterp/corefcn/__ichol__.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/__ichol__.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "builtin-defun-decls.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Secondary functions for complex and real case used in ichol algorithms. Complex ichol_mult_complex (Complex a, Complex b) @@ -470,4 +470,4 @@ %! assert (norm (A - L*L.'), 0, 2*eps); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/__ilu__.cc --- a/libinterp/corefcn/__ilu__.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/__ilu__.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "builtin-defun-decls.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // This function implements the IKJ and JKI variants of Gaussian elimination to // perform the ILU0 decomposition. The behavior is controlled by milu @@ -1010,4 +1010,4 @@ %!assert (1) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/__isprimelarge__.cc --- a/libinterp/corefcn/__isprimelarge__.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/__isprimelarge__.cc Thu Dec 01 14:28:07 2022 -0800 @@ -31,7 +31,7 @@ #include "error.h" #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // This function implements the Schrage technique for modular multiplication. // The returned value is equivalent to "mod (a*b, modulus)" @@ -278,4 +278,4 @@ %!error (__pollardrho__ ({'foo'; 'bar'})) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/__lin_interpn__.cc --- a/libinterp/corefcn/__lin_interpn__.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/__lin_interpn__.cc Thu Dec 01 14:28:07 2022 -0800 @@ -37,7 +37,7 @@ #include -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // equivalent to isvector.m @@ -356,4 +356,4 @@ %! assert (imag (vi_complex), vi_imag); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/__magick_read__.cc --- a/libinterp/corefcn/__magick_read__.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/__magick_read__.cc Thu Dec 01 14:28:07 2022 -0800 @@ -48,7 +48,7 @@ using Magick::Quantum; #endif -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) #if defined (HAVE_MAGICK) @@ -2416,4 +2416,4 @@ %!assert (1) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/__pchip_deriv__.cc --- a/libinterp/corefcn/__pchip_deriv__.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/__pchip_deriv__.cc Thu Dec 01 14:28:07 2022 -0800 @@ -36,7 +36,7 @@ #include "utils.h" #include "f77-fcn.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Wrapper for SLATEC/PCHIP function DPCHIM to calculate the derivates // for piecewise polynomials. @@ -258,4 +258,4 @@ %! assert (imag (d_complex), d_imag); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/__qp__.cc --- a/libinterp/corefcn/__qp__.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/__qp__.cc Thu Dec 01 14:28:07 2022 -0800 @@ -43,7 +43,7 @@ #include "pr-output.h" #include "utils.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) static octave_idx_type min_index (const ColumnVector& x) @@ -523,4 +523,4 @@ %!assert (1) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/amd.cc --- a/libinterp/corefcn/amd.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/amd.cc Thu Dec 01 14:28:07 2022 -0800 @@ -46,7 +46,7 @@ #include "ovl.h" #include "parse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (amd, args, nargout, doc: /* -*- texinfo -*- @@ -203,4 +203,4 @@ %!error amd (A2, 2) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/auto-shlib.cc --- a/libinterp/corefcn/auto-shlib.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/auto-shlib.cc Thu Dec 01 14:28:07 2022 -0800 @@ -32,10 +32,10 @@ #include "auto-shlib.h" #include "defun-int.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) auto_shlib::auto_shlib (void) : dynamic_library (get_current_shlib ()) { } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/auto-shlib.h --- a/libinterp/corefcn/auto-shlib.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/auto-shlib.h Thu Dec 01 14:28:07 2022 -0800 @@ -30,7 +30,7 @@ #include "oct-shlib.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // This is a convenience class that calls the // octave::get_dynamic_library function automatically at construction @@ -52,6 +52,6 @@ auto_shlib& operator = (const auto_shlib&) = default; }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/balance.cc --- a/libinterp/corefcn/balance.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/balance.cc Thu Dec 01 14:28:07 2022 -0800 @@ -44,7 +44,7 @@ #include "ovl.h" #include "utils.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (balance, args, nargout, doc: /* -*- texinfo -*- @@ -374,4 +374,4 @@ return retval; } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/base-text-renderer.cc --- a/libinterp/corefcn/base-text-renderer.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/base-text-renderer.cc Thu Dec 01 14:28:07 2022 -0800 @@ -29,8 +29,8 @@ #include "base-text-renderer.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + void base_text_renderer::rotate_pixels (uint8NDArray& pixels, int rot_mode) const { @@ -170,4 +170,5 @@ } } } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/base-text-renderer.h --- a/libinterp/corefcn/base-text-renderer.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/base-text-renderer.h Thu Dec 01 14:28:07 2022 -0800 @@ -38,8 +38,8 @@ #include "text-engine.h" #include "text-renderer.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_text_renderer : public text_processor { @@ -106,6 +106,7 @@ bool handle_rotation) const; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/besselj.cc --- a/libinterp/corefcn/besselj.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/besselj.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "ovl.h" #include "utils.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) enum bessel_type { @@ -1372,4 +1372,4 @@ %! assert (y, yt, -1e-9); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/bitfcns.cc --- a/libinterp/corefcn/bitfcns.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/bitfcns.cc Thu Dec 01 14:28:07 2022 -0800 @@ -51,8 +51,8 @@ #include #if ! defined (HAVE_CXX_BITWISE_OP_TEMPLATES) -namespace std -{ +OCTAVE_BEGIN_NAMESPACE(std) + template struct bit_and { @@ -73,10 +73,11 @@ public: T operator() (const T& op1, const T& op2) const { return (op1 ^ op2); } }; -} + +OCTAVE_END_NAMESPACE(std) #endif -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) template octave_value @@ -975,4 +976,4 @@ %!error sizemax (0) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/bsxfun.cc --- a/libinterp/corefcn/bsxfun.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/bsxfun.cc Thu Dec 01 14:28:07 2022 -0800 @@ -320,7 +320,7 @@ } } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFMETHOD (bsxfun, interp, args, , doc: /* -*- texinfo -*- @@ -844,4 +844,4 @@ */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/c-file-ptr-stream.cc --- a/libinterp/corefcn/c-file-ptr-stream.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/c-file-ptr-stream.cc Thu Dec 01 14:28:07 2022 -0800 @@ -33,7 +33,7 @@ #include "c-file-ptr-stream.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) #if ! defined (SEEK_SET) # define SEEK_SET 0 @@ -320,4 +320,4 @@ #endif -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/c-file-ptr-stream.h --- a/libinterp/corefcn/c-file-ptr-stream.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/c-file-ptr-stream.h Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ # include #endif -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class c_file_ptr_buf : public std::streambuf @@ -230,6 +230,6 @@ #endif -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/call-stack.cc --- a/libinterp/corefcn/call-stack.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/call-stack.cc Thu Dec 01 14:28:07 2022 -0800 @@ -47,7 +47,7 @@ #include "symscope.h" #include "variables.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Use static fields for the best efficiency. // NOTE: C++0x will allow these two to be merged into one. @@ -1301,4 +1301,4 @@ return tw.do_who (argc, argv, nargout == 1, true); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/call-stack.h --- a/libinterp/corefcn/call-stack.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/call-stack.h Thu Dec 01 14:28:07 2022 -0800 @@ -44,7 +44,7 @@ #include "stack-frame.h" #include "symscope.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class tree_evaluator; class symbol_info_list; @@ -326,6 +326,6 @@ std::map m_global_values; }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/ccolamd.cc --- a/libinterp/corefcn/ccolamd.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/ccolamd.cc Thu Dec 01 14:28:07 2022 -0800 @@ -44,7 +44,7 @@ #include "ov.h" #include "pager.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (ccolamd, args, nargout, doc: /* -*- texinfo -*- @@ -584,4 +584,4 @@ #endif } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/cellfun.cc --- a/libinterp/corefcn/cellfun.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/cellfun.cc Thu Dec 01 14:28:07 2022 -0800 @@ -65,7 +65,7 @@ #include "ov-fcn-handle.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) static octave_value_list get_output_list (error_system& es, @@ -2546,4 +2546,4 @@ return octave_value (y); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/chol.cc --- a/libinterp/corefcn/chol.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/chol.cc Thu Dec 01 14:28:07 2022 -0800 @@ -41,7 +41,7 @@ #include "ov.h" #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) template static octave_value @@ -1334,4 +1334,4 @@ %! assert (norm (R1'*R1 - single (Ac(p,p)), Inf) < 1e1*eps ("single")); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/colamd.cc --- a/libinterp/corefcn/colamd.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/colamd.cc Thu Dec 01 14:28:07 2022 -0800 @@ -46,7 +46,7 @@ #include "ovl.h" #include "pager.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // The symmetric column elimination tree code take from the Davis LDL code. // Copyright given elsewhere in this file. @@ -786,4 +786,4 @@ %!error etree (sprand (2, 4, .25)) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/colloc.cc --- a/libinterp/corefcn/colloc.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/colloc.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "ovl.h" #include "utils.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (colloc, args, , doc: /* -*- texinfo -*- @@ -116,4 +116,4 @@ */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/conv2.cc --- a/libinterp/corefcn/conv2.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/conv2.cc Thu Dec 01 14:28:07 2022 -0800 @@ -34,7 +34,7 @@ #include "ovl.h" #include "utils.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) enum Shape { SHAPE_FULL, SHAPE_SAME, SHAPE_VALID }; @@ -571,4 +571,4 @@ %!error convn (rand (3), 1, 1) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/daspk.cc --- a/libinterp/corefcn/daspk.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/daspk.cc Thu Dec 01 14:28:07 2022 -0800 @@ -47,7 +47,7 @@ #include "DASPK-opts.cc" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Global pointer for user defined function required by daspk. static octave_value daspk_fcn; @@ -404,4 +404,4 @@ return retval; } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/dasrt.cc --- a/libinterp/corefcn/dasrt.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/dasrt.cc Thu Dec 01 14:28:07 2022 -0800 @@ -48,7 +48,7 @@ #include "DASRT-opts.cc" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Global pointers for user defined function required by dasrt. static octave_value dasrt_fcn; @@ -522,4 +522,4 @@ return retval; } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/dassl.cc --- a/libinterp/corefcn/dassl.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/dassl.cc Thu Dec 01 14:28:07 2022 -0800 @@ -46,7 +46,7 @@ #include "DASSL-opts.cc" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Global pointer for user defined function required by dassl. static octave_value dassl_fcn; @@ -491,4 +491,4 @@ %!error dassl_options ("foo", 1, 2) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/data.cc --- a/libinterp/corefcn/data.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/data.cc Thu Dec 01 14:28:07 2022 -0800 @@ -66,7 +66,7 @@ #include "variables.h" #include "xnorm.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (all, args, , doc: /* -*- texinfo -*- @@ -8608,4 +8608,4 @@ %!error __base64_decode_bytes__ (1) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/data.h --- a/libinterp/corefcn/data.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/data.h Thu Dec 01 14:28:07 2022 -0800 @@ -33,12 +33,12 @@ class octave_value; class octave_value_list; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) extern OCTINTERP_API octave_value do_class_concat (const octave_value_list& ovl, const std::string& cattype, int dim); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/debug.cc --- a/libinterp/corefcn/debug.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/debug.cc Thu Dec 01 14:28:07 2022 -0800 @@ -59,7 +59,7 @@ #include "utils.h" #include "variables.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) static octave_value bp_lines_to_ov (const octave::bp_table::bp_lines& lines) @@ -1207,4 +1207,4 @@ return ovl (); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/defaults.cc --- a/libinterp/corefcn/defaults.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/defaults.cc Thu Dec 01 14:28:07 2022 -0800 @@ -47,10 +47,10 @@ #include "default-defs.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) - namespace config - { +OCTAVE_BEGIN_NAMESPACE(config) + // Variables that name directories or files are substituted into source // files with "${prefix}/" stripped from the beginning of the string. @@ -446,7 +446,8 @@ return s_site_defaults_file; } - } + +OCTAVE_END_NAMESPACE(config) DEFUN (OCTAVE_HOME, args, , doc: /* -*- texinfo -*- @@ -544,4 +545,4 @@ %!error user_data_dir (1) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/defaults.h --- a/libinterp/corefcn/defaults.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/defaults.h Thu Dec 01 14:28:07 2022 -0800 @@ -32,10 +32,10 @@ #include "pathsearch.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) - namespace config - { +OCTAVE_BEGIN_NAMESPACE(config) + extern OCTINTERP_API std::string prepend_octave_home (const std::string& s); @@ -101,8 +101,9 @@ extern OCTINTERP_API std::string local_site_defaults_file (void); extern OCTINTERP_API std::string site_defaults_file (void); - } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(config) + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/defun-int.h --- a/libinterp/corefcn/defun-int.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/defun-int.h Thu Dec 01 14:28:07 2022 -0800 @@ -36,7 +36,7 @@ class octave_value; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class interpreter; @@ -64,7 +64,7 @@ // Gets the shlib of the currently executing DLD function, if any. extern OCTINTERP_API dynamic_library get_current_shlib (void); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) // Some of these functions are widely used, so maybe we should avoid // deprecating them for now? diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/defun.cc --- a/libinterp/corefcn/defun.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/defun.cc Thu Dec 01 14:28:07 2022 -0800 @@ -48,7 +48,7 @@ #include "variables.h" #include "parse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Print the usage part of the doc string of FCN (user-defined or DEFUN). void @@ -163,4 +163,4 @@ return retval; } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/det.cc --- a/libinterp/corefcn/det.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/det.cc Thu Dec 01 14:28:07 2022 -0800 @@ -45,7 +45,7 @@ #include "ov-flt-cx-diag.h" #include "ov-perm.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) #define MAYBE_CAST(VAR, CLASS) \ const CLASS *VAR = (arg.type_id () == CLASS::static_type_id () \ @@ -237,4 +237,4 @@ %!error det ([1, 2; 3, 4; 5, 6]) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/dirfns.cc --- a/libinterp/corefcn/dirfns.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/dirfns.cc Thu Dec 01 14:28:07 2022 -0800 @@ -62,7 +62,7 @@ #include "utils.h" #include "variables.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // TRUE means we ask for confirmation before recursively removing a // directory tree. @@ -783,4 +783,4 @@ "confirm_recursive_rmdir"); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/display.cc --- a/libinterp/corefcn/display.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/display.cc Thu Dec 01 14:28:07 2022 -0800 @@ -37,7 +37,7 @@ #include "ov.h" #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) void display_info::initialize (void) { @@ -66,4 +66,4 @@ return ovl (dpy_info.display_available ()); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/display.h --- a/libinterp/corefcn/display.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/display.h Thu Dec 01 14:28:07 2022 -0800 @@ -32,7 +32,7 @@ class Matrix; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class display_info { @@ -87,6 +87,6 @@ std::string m_msg; }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/dlmread.cc --- a/libinterp/corefcn/dlmread.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/dlmread.cc Thu Dec 01 14:28:07 2022 -0800 @@ -167,7 +167,7 @@ return stat; } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFMETHOD (dlmread, interp, args, , doc: /* -*- texinfo -*- @@ -767,4 +767,4 @@ */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/dmperm.cc --- a/libinterp/corefcn/dmperm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/dmperm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "ovl.h" #include "utils.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) #if defined (OCTAVE_ENABLE_64) # define CXSPARSE_NAME(name) cs_dl ## name @@ -260,4 +260,4 @@ %!error sprank (1,2) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/dot.cc --- a/libinterp/corefcn/dot.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/dot.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "error.h" #include "parse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // FIXME: input 'y' is no longer necessary (2/5/2022). // At some point it would be better to change all occurrences of @@ -436,4 +436,4 @@ %!error blkmm (ones (2,2), ones (3,3)) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/dynamic-ld.cc --- a/libinterp/corefcn/dynamic-ld.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/dynamic-ld.cc Thu Dec 01 14:28:07 2022 -0800 @@ -49,8 +49,8 @@ #define STRINGIFY(s) STRINGIFY1(s) #define STRINGIFY1(s) #s -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + void dynamic_loader::shlibs_list::append (const dynamic_library& shl) { @@ -320,4 +320,5 @@ { return STRINGIFY (F77_FUNC (mexfunction, MEXFUNCTION)); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/dynamic-ld.h --- a/libinterp/corefcn/dynamic-ld.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/dynamic-ld.h Thu Dec 01 14:28:07 2022 -0800 @@ -35,8 +35,8 @@ class octave_function; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class interpreter; class @@ -132,6 +132,7 @@ static void * try_load_mex (dynamic_library& mex_file, const std::string& fcn_name, bool& have_fmex); }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/eig.cc --- a/libinterp/corefcn/eig.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/eig.cc Thu Dec 01 14:28:07 2022 -0800 @@ -36,7 +36,7 @@ #include "fEIG.h" #include "oct-string.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (eig, args, nargout, doc: /* -*- texinfo -*- @@ -641,4 +641,4 @@ %! eig ([1 2 ; 2 3], [1 2 ; 2 3], [1 2 ; 2 3]) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/ellipj.cc --- a/libinterp/corefcn/ellipj.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/ellipj.cc Thu Dec 01 14:28:07 2022 -0800 @@ -31,7 +31,7 @@ #include "error.h" #include "lo-specfun.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (ellipj, args, , doc: /* -*- texinfo -*- @@ -850,4 +850,4 @@ */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/environment.cc --- a/libinterp/corefcn/environment.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/environment.cc Thu Dec 01 14:28:07 2022 -0800 @@ -41,7 +41,7 @@ #include "interpreter.h" #include "variables.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) static void append_to_shell_path (const std::string& exec_path) { @@ -257,4 +257,4 @@ %!error IMAGE_PATH (1, 2) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/environment.h --- a/libinterp/corefcn/environment.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/environment.h Thu Dec 01 14:28:07 2022 -0800 @@ -33,7 +33,7 @@ class octave_value; class octave_value_list; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class environment { @@ -91,6 +91,6 @@ } }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/error.cc --- a/libinterp/corefcn/error.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/error.cc Thu Dec 01 14:28:07 2022 -0800 @@ -233,7 +233,7 @@ return have_fmt; } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) static octave_scalar_map init_warning_options (const std::string& state) @@ -916,7 +916,7 @@ evmgr.display_exception (ee, m_beep_on_error); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) void vmessage (const char *name, const char *fmt, va_list args) @@ -1112,7 +1112,7 @@ va_end (args); } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) void defun_usage_message (const std::string& msg) @@ -2166,4 +2166,4 @@ es.interpreter_try (frame); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/error.h --- a/libinterp/corefcn/error.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/error.h Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ class octave_value_list; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class execution_exception; @@ -395,7 +395,7 @@ octave_map m_last_error_stack; }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) // FIXME: should we move the following functions inside the octave // namespace? If so, should the functions outside of the namespace be @@ -544,7 +544,7 @@ error_if (! cond); } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) //! Helper function for print_usage defined in defun.cc. @@ -564,6 +564,6 @@ extern OCTINTERP_API void interpreter_try (octave::unwind_protect&); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/errwarn.h --- a/libinterp/corefcn/errwarn.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/errwarn.h Thu Dec 01 14:28:07 2022 -0800 @@ -33,10 +33,11 @@ #include "lo-array-errwarn.h" class octave_value; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class execution_exception; -} + +OCTAVE_END_NAMESPACE(octave) //////////////////////////////////////////////////////////////////////////////// // Alphabetized list of common errors and warnings. diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/event-manager.cc --- a/libinterp/corefcn/event-manager.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/event-manager.cc Thu Dec 01 14:28:07 2022 -0800 @@ -44,7 +44,7 @@ #include "quit.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) static int readline_event_hook (void) { @@ -879,4 +879,4 @@ return ovl (); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/event-manager.h --- a/libinterp/corefcn/event-manager.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/event-manager.h Thu Dec 01 14:28:07 2022 -0800 @@ -42,7 +42,7 @@ class octave_value; class string_vector; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) typedef std::function fcn_callback; typedef std::function meth_callback; @@ -794,6 +794,6 @@ }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/event-queue.cc --- a/libinterp/corefcn/event-queue.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/event-queue.cc Thu Dec 01 14:28:07 2022 -0800 @@ -30,8 +30,8 @@ #include "error.h" #include "event-queue.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + void event_queue_safe::warn_unhandled_exception (void) const { @@ -39,4 +39,5 @@ "It is a bug in Octave for this to happen. " "Please help improve Octave by reporting it."); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/event-queue.h --- a/libinterp/corefcn/event-queue.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/event-queue.h Thu Dec 01 14:28:07 2022 -0800 @@ -33,8 +33,8 @@ #include "action-container.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class event_queue : public action_container { @@ -125,6 +125,7 @@ void warn_unhandled_exception (void) const; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/fcn-info.cc --- a/libinterp/corefcn/fcn-info.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/fcn-info.cc Thu Dec 01 14:28:07 2022 -0800 @@ -47,7 +47,7 @@ // since they were last compiled? static int Vignore_function_time_stamp = 1; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) octave_value fcn_info::fcn_info_rep::load_private_function (const std::string& dir_name) @@ -1215,4 +1215,4 @@ %!error ignore_function_time_stamp (42) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/fcn-info.h --- a/libinterp/corefcn/fcn-info.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/fcn-info.h Thu Dec 01 14:28:07 2022 -0800 @@ -37,7 +37,7 @@ #include "ovl.h" #include "symscope.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class fcn_info { @@ -366,6 +366,6 @@ extern octave_value dump_function_map (const std::map& fcn_map); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/fft.cc --- a/libinterp/corefcn/fft.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/fft.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "ovl.h" #include "utils.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) static octave_value do_fft (const octave_value_list& args, const char *fcn, int type) @@ -314,4 +314,4 @@ %! assert (ifft (S), s, 4*N*eps ("single")); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/fft2.cc --- a/libinterp/corefcn/fft2.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/fft2.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "ovl.h" #include "utils.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // This function should be merged with Fifft. @@ -260,4 +260,4 @@ %! assert (s, answer, 30*eps ("single")); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/fftn.cc --- a/libinterp/corefcn/fftn.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/fftn.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "ovl.h" #include "utils.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // This function should be merged with Fifft. @@ -162,4 +162,4 @@ return do_fftn (args, "ifftn", 1); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/file-io.cc --- a/libinterp/corefcn/file-io.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/file-io.cc Thu Dec 01 14:28:07 2022 -0800 @@ -82,7 +82,7 @@ #include "utils.h" #include "variables.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) static void normalize_fopen_mode (std::string& mode, bool& use_zlib) @@ -3331,4 +3331,4 @@ return const_value ("stderr", args, streams.stderr_file ()); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/filter.cc --- a/libinterp/corefcn/filter.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/filter.cc Thu Dec 01 14:28:07 2022 -0800 @@ -41,7 +41,7 @@ #include "error.h" #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) template MArray @@ -650,4 +650,4 @@ %! assert (y, y0); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/find.cc --- a/libinterp/corefcn/find.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/find.cc Thu Dec 01 14:28:07 2022 -0800 @@ -34,7 +34,7 @@ #include "errwarn.h" #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Find at most N_TO_FIND nonzero elements in NDA. Search forward if // DIRECTION is 1, backward if it is -1. NARGOUT is the number of @@ -616,4 +616,4 @@ %!error find () */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/ft-text-renderer.cc --- a/libinterp/corefcn/ft-text-renderer.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/ft-text-renderer.cc Thu Dec 01 14:28:07 2022 -0800 @@ -65,8 +65,8 @@ #include "sysdep.h" #include "text-renderer.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // FIXME: maybe issue at most one warning per glyph/font/size/weight // combination. @@ -1526,12 +1526,13 @@ return m_face; } -} + +OCTAVE_END_NAMESPACE(octave) #endif -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + base_text_renderer * make_ft_text_renderer (void) { @@ -1541,4 +1542,5 @@ return 0; #endif } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/ft-text-renderer.h --- a/libinterp/corefcn/ft-text-renderer.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/ft-text-renderer.h Thu Dec 01 14:28:07 2022 -0800 @@ -28,11 +28,12 @@ #include "octave-config.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_text_renderer; extern base_text_renderer * make_ft_text_renderer (void); -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/gcd.cc --- a/libinterp/corefcn/gcd.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/gcd.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "error.h" #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) static double simple_gcd (double a, double b) @@ -535,4 +535,4 @@ %! fail ("gcd (s)"); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/getgrent.cc --- a/libinterp/corefcn/getgrent.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/getgrent.cc Thu Dec 01 14:28:07 2022 -0800 @@ -41,7 +41,7 @@ #include "ovl.h" #include "utils.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Group file functions. (Why not?) @@ -170,4 +170,4 @@ return ovl (static_cast (status), msg); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/getpwent.cc --- a/libinterp/corefcn/getpwent.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/getpwent.cc Thu Dec 01 14:28:07 2022 -0800 @@ -41,7 +41,7 @@ #include "ovl.h" #include "utils.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Password file functions. (Why not?) @@ -176,4 +176,4 @@ return ovl (static_cast (status), msg); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/getrusage.cc --- a/libinterp/corefcn/getrusage.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/getrusage.cc Thu Dec 01 14:28:07 2022 -0800 @@ -34,7 +34,7 @@ #include "ov.h" #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (getrusage, , , doc: /* -*- texinfo -*- @@ -158,4 +158,4 @@ %! assert (isfield (r.utime, "usec")); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/givens.cc --- a/libinterp/corefcn/givens.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/givens.cc Thu Dec 01 14:28:07 2022 -0800 @@ -33,7 +33,7 @@ #include "error.h" #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (givens, args, nargout, doc: /* -*- texinfo -*- @@ -193,4 +193,4 @@ %!error [a,b,c] = givens (1, 1) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/gl-render.cc --- a/libinterp/corefcn/gl-render.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/gl-render.cc Thu Dec 01 14:28:07 2022 -0800 @@ -45,8 +45,8 @@ #include "oct-opengl.h" #include "text-renderer.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + #if defined (HAVE_OPENGL) static int @@ -4985,4 +4985,5 @@ #endif } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/gl-render.h --- a/libinterp/corefcn/gl-render.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/gl-render.h Thu Dec 01 14:28:07 2022 -0800 @@ -31,8 +31,8 @@ #include "graphics.h" #include "text-renderer.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class opengl_functions; class @@ -262,6 +262,7 @@ // Indicate we are drawing for printing purpose bool m_printing; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/gl2ps-print.cc --- a/libinterp/corefcn/gl2ps-print.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/gl2ps-print.cc Thu Dec 01 14:28:07 2022 -0800 @@ -54,8 +54,8 @@ #include "sysdep.h" #include "text-renderer.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class OCTINTERP_API gl2ps_renderer : public opengl_renderer @@ -1583,12 +1583,13 @@ render_text (str, pos(0), pos(1), pos.numel () > 2 ? pos(2) : 0.0, halign, valign, props.get_rotation ()); } -} + +OCTAVE_END_NAMESPACE(octave) #endif -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // If the name of the stream begins with '|', open a pipe to the command // named by the rest of the string. Otherwise, write to the named file. @@ -1653,4 +1654,5 @@ #endif } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/gl2ps-print.h --- a/libinterp/corefcn/gl2ps-print.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/gl2ps-print.h Thu Dec 01 14:28:07 2022 -0800 @@ -32,13 +32,14 @@ #include "graphics.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class opengl_functions; extern OCTINTERP_API void gl2ps_print (opengl_functions& glfcns, const graphics_object& fig, const std::string& stream, const std::string& term); -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/graphics-toolkit.cc --- a/libinterp/corefcn/graphics-toolkit.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/graphics-toolkit.cc Thu Dec 01 14:28:07 2022 -0800 @@ -31,8 +31,8 @@ #include "gtk-manager.h" #include "interpreter-private.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + void base_graphics_toolkit::update (const graphics_handle& h, int id) { @@ -62,4 +62,5 @@ finalize (go); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/graphics-toolkit.h --- a/libinterp/corefcn/graphics-toolkit.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/graphics-toolkit.h Thu Dec 01 14:28:07 2022 -0800 @@ -38,8 +38,8 @@ #include "error.h" #include "graphics-handle.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class graphics_object; class graphics_toolkit; @@ -282,6 +282,7 @@ std::shared_ptr m_rep; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/graphics.cc --- a/libinterp/corefcn/graphics.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/graphics.cc Thu Dec 01 14:28:07 2022 -0800 @@ -67,7 +67,7 @@ #include "utils.h" #include "octave-default-image.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // forward declarations static octave_value xget (const graphics_handle& h, const caseless_str& name); @@ -14768,4 +14768,4 @@ return ovl (txt_renderer.get_system_fonts ()); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/graphics.in.h --- a/libinterp/corefcn/graphics.in.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/graphics.in.h Thu Dec 01 14:28:07 2022 -0800 @@ -52,7 +52,7 @@ #include "ov.h" #include "text-renderer.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // FIXME: maybe this should be a configure option? // Matlab defaults to "Helvetica", but that causes problems for many @@ -6956,6 +6956,6 @@ OCTINTERP_API void close_all_figures (void); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/gsvd.cc --- a/libinterp/corefcn/gsvd.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/gsvd.cc Thu Dec 01 14:28:07 2022 -0800 @@ -40,7 +40,7 @@ #include "ovl.h" #include "ov.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) template static typename math::gsvd::Type @@ -498,4 +498,4 @@ */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/gtk-manager.cc --- a/libinterp/corefcn/gtk-manager.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/gtk-manager.cc Thu Dec 01 14:28:07 2022 -0800 @@ -33,8 +33,8 @@ #include "ovl.h" #include "parse.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + graphics_toolkit gtk_manager::get_toolkit (void) const { @@ -109,4 +109,5 @@ } } } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/gtk-manager.h --- a/libinterp/corefcn/gtk-manager.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/gtk-manager.h Thu Dec 01 14:28:07 2022 -0800 @@ -35,8 +35,8 @@ #include "Cell.h" #include "graphics-toolkit.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class OCTINTERP_API gtk_manager { public: @@ -125,6 +125,7 @@ // The list of toolkits we have actually loaded. std::map m_loaded_toolkits; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/hash.cc --- a/libinterp/corefcn/hash.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/hash.cc Thu Dec 01 14:28:07 2022 -0800 @@ -49,7 +49,7 @@ #include "ov.h" #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (hash, args, , doc: /* -*- texinfo -*- @@ -242,4 +242,4 @@ %!error hash ("sha512") */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/help.cc --- a/libinterp/corefcn/help.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/help.cc Thu Dec 01 14:28:07 2022 -0800 @@ -74,7 +74,7 @@ #include "default-defs.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) const static char * const operators[] = { @@ -1123,4 +1123,4 @@ return help_sys.texi_macros_file (args, nargout); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/help.h --- a/libinterp/corefcn/help.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/help.h Thu Dec 01 14:28:07 2022 -0800 @@ -36,7 +36,7 @@ class octave_value; class octave_value_list; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class interpreter; @@ -203,6 +203,6 @@ extern string_vector make_name_list (void); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/hess.cc --- a/libinterp/corefcn/hess.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/hess.cc Thu Dec 01 14:28:07 2022 -0800 @@ -34,7 +34,7 @@ #include "errwarn.h" #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (hess, args, nargout, doc: /* -*- texinfo -*- @@ -154,4 +154,4 @@ %!error hess ([1, 2; 3, 4; 5, 6]) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/hex2num.cc --- a/libinterp/corefcn/hex2num.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/hex2num.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "ovl.h" #include "utils.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) static inline bool is_little_endian (bool is_float) @@ -381,4 +381,4 @@ %!error num2hex (1j) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/hook-fcn.cc --- a/libinterp/corefcn/hook-fcn.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/hook-fcn.cc Thu Dec 01 14:28:07 2022 -0800 @@ -30,8 +30,8 @@ #include "hook-fcn.h" #include "parse.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + hook_function::hook_function (const octave_value& f, const octave_value& d) { if (f.is_string ()) @@ -67,4 +67,5 @@ feval (m_fcn_handle, args, 0); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/hook-fcn.h --- a/libinterp/corefcn/hook-fcn.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/hook-fcn.h Thu Dec 01 14:28:07 2022 -0800 @@ -36,8 +36,8 @@ #include "ov-fcn-handle.h" #include "variables.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_hook_function { public: @@ -211,6 +211,7 @@ map_type m_fcn_map; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/input.cc --- a/libinterp/corefcn/input.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/input.cc Thu Dec 01 14:28:07 2022 -0800 @@ -90,7 +90,7 @@ // the next user prompt. bool Vdrawnow_requested = false; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) static std::string quoting_filename (const std::string& text, int, char quote) @@ -1677,4 +1677,4 @@ return input_sys.auto_repeat_debug_command (args, nargout); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/input.h --- a/libinterp/corefcn/input.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/input.h Thu Dec 01 14:28:07 2022 -0800 @@ -52,7 +52,7 @@ class octave_value; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class interpreter; @@ -304,6 +304,6 @@ std::shared_ptr m_rep; }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/interpreter-private.cc --- a/libinterp/corefcn/interpreter-private.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/interpreter-private.cc Thu Dec 01 14:28:07 2022 -0800 @@ -49,8 +49,8 @@ #include "pager.h" #include "symtab.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + interpreter& __get_interpreter__ (void) { interpreter *interp = interpreter::the_interpreter (); @@ -249,4 +249,5 @@ return octave_value (); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/interpreter-private.h --- a/libinterp/corefcn/interpreter-private.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/interpreter-private.h Thu Dec 01 14:28:07 2022 -0800 @@ -33,8 +33,8 @@ #include "symtab.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class bp_table; class cdef_manager; class child_list; @@ -111,6 +111,7 @@ get_function_handle (interpreter& interp, const octave_value& arg, const std::list& parameter_names = std::list ()); -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/interpreter.cc --- a/libinterp/corefcn/interpreter.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/interpreter.cc Thu Dec 01 14:28:07 2022 -0800 @@ -93,7 +93,7 @@ // TRUE means we've processed all the init code and we are good to go. bool octave_initialized = false; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (__version_info__, args, , doc: /* -*- texinfo -*- @@ -2082,4 +2082,4 @@ } } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/interpreter.h --- a/libinterp/corefcn/interpreter.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/interpreter.h Thu Dec 01 14:28:07 2022 -0800 @@ -70,7 +70,7 @@ #include "oct-time.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class profiler; class child_list; @@ -648,6 +648,6 @@ bool m_initialized; }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/inv.cc --- a/libinterp/corefcn/inv.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/inv.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "ov-flt-cx-diag.h" #include "ov-perm.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (inv, args, nargout, doc: /* -*- texinfo -*- @@ -395,4 +395,4 @@ DEFALIAS (inverse, inv); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/jsondecode.cc --- a/libinterp/corefcn/jsondecode.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/jsondecode.cc Thu Dec 01 14:28:07 2022 -0800 @@ -39,7 +39,7 @@ # include #endif -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) #if defined (HAVE_RAPIDJSON) @@ -654,4 +654,4 @@ */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/jsonencode.cc --- a/libinterp/corefcn/jsonencode.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/jsonencode.cc Thu Dec 01 14:28:07 2022 -0800 @@ -442,7 +442,7 @@ #endif -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (jsonencode, args, , doc: /* -*- texinfo -*- @@ -671,4 +671,4 @@ */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/kron.cc --- a/libinterp/corefcn/kron.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/kron.cc Thu Dec 01 14:28:07 2022 -0800 @@ -49,7 +49,7 @@ #include "error.h" #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) template static MArray @@ -334,4 +334,4 @@ %! assert (kron (diag ([1, 2], 2), diag ([3, 4], 2)), expected); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/latex-text-renderer.cc --- a/libinterp/corefcn/latex-text-renderer.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/latex-text-renderer.cc Thu Dec 01 14:28:07 2022 -0800 @@ -41,8 +41,8 @@ #include "oct-env.h" #include "oct-process.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + std::string quote_string (std::string str) { @@ -528,4 +528,5 @@ return renderer; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/latex-text-renderer.h --- a/libinterp/corefcn/latex-text-renderer.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/latex-text-renderer.h Thu Dec 01 14:28:07 2022 -0800 @@ -28,11 +28,12 @@ #include "octave-config.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_text_renderer; extern base_text_renderer * make_latex_text_renderer (void); -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/load-path.cc --- a/libinterp/corefcn/load-path.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/load-path.cc Thu Dec 01 14:28:07 2022 -0800 @@ -49,7 +49,7 @@ #include "unwind-prot.h" #include "utils.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Canonicalize file name (keeping the path relative) if it exists. // Return it unmodified otherwise. @@ -2832,4 +2832,4 @@ return ovl (); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/load-path.h --- a/libinterp/corefcn/load-path.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/load-path.h Thu Dec 01 14:28:07 2022 -0800 @@ -39,7 +39,7 @@ #include "pathsearch.h" #include "str-vec.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class OCTINTERP_API @@ -583,6 +583,6 @@ extern std::string genpath (const std::string& dir, const string_vector& skip = "private"); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/load-save.cc --- a/libinterp/corefcn/load-save.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/load-save.cc Thu Dec 01 14:28:07 2022 -0800 @@ -90,7 +90,7 @@ # include "gzfstream.h" #endif -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) OCTAVE_NORETURN static void @@ -2059,4 +2059,4 @@ return load_save_sys.save_header_format_string (args, nargout); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/load-save.h --- a/libinterp/corefcn/load-save.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/load-save.h Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class interpreter; class load_save_format; @@ -292,6 +292,6 @@ int m_options; }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/lookup.cc --- a/libinterp/corefcn/lookup.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/lookup.cc Thu Dec 01 14:28:07 2022 -0800 @@ -41,7 +41,7 @@ #include "ovl.h" #include "ov.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) static bool @@ -350,4 +350,4 @@ %!assert (lookup ({"orange","lemon","apple"}, "potato"), 0) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/ls-ascii-helper.cc --- a/libinterp/corefcn/ls-ascii-helper.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/ls-ascii-helper.cc Thu Dec 01 14:28:07 2022 -0800 @@ -32,7 +32,7 @@ #include #include -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Helper functions when reading from ascii files. @@ -180,4 +180,4 @@ return buf.str (); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/ls-ascii-helper.h --- a/libinterp/corefcn/ls-ascii-helper.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/ls-ascii-helper.h Thu Dec 01 14:28:07 2022 -0800 @@ -31,7 +31,7 @@ #include #include -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) extern OCTINTERP_API void skip_until_newline (std::istream& is, bool keep_newline = false); @@ -42,6 +42,6 @@ extern OCTINTERP_API std::string read_until_newline (std::istream& is, bool keep_newline = false); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/ls-oct-text.cc --- a/libinterp/corefcn/ls-oct-text.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/ls-oct-text.cc Thu Dec 01 14:28:07 2022 -0800 @@ -455,7 +455,7 @@ return (static_cast (os)); } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (save_precision, args, nargout, doc: /* -*- texinfo -*- @@ -483,4 +483,4 @@ std::numeric_limits::max ()); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/ls-utils.cc --- a/libinterp/corefcn/ls-utils.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/ls-utils.cc Thu Dec 01 14:28:07 2022 -0800 @@ -31,7 +31,7 @@ #include "ls-utils.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // MAX_VAL and MIN_VAL are assumed to have integral values even though // they are stored in doubles. @@ -92,5 +92,5 @@ return st; } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/ls-utils.h --- a/libinterp/corefcn/ls-utils.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/ls-utils.h Thu Dec 01 14:28:07 2022 -0800 @@ -30,7 +30,7 @@ #include "data-conv.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) extern OCTINTERP_API save_type get_save_type (double max_val, double min_val); @@ -38,6 +38,6 @@ extern OCTINTERP_API save_type get_save_type (float max_val, float min_val); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/lsode.cc --- a/libinterp/corefcn/lsode.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/lsode.cc Thu Dec 01 14:28:07 2022 -0800 @@ -49,7 +49,7 @@ #include "LSODE-opts.cc" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Global pointer for user defined function required by lsode. static octave_value lsode_fcn; @@ -490,4 +490,4 @@ %!error lsode_options ("foo", 1, 2) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/lu.cc --- a/libinterp/corefcn/lu.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/lu.cc Thu Dec 01 14:28:07 2022 -0800 @@ -37,7 +37,7 @@ #include "ov-re-sparse.h" #include "ov-cx-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) template static octave_value @@ -837,4 +837,4 @@ %! < norm (single (Ac))*1e1*eps ("single")); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/mappers.cc --- a/libinterp/corefcn/mappers.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/mappers.cc Thu Dec 01 14:28:07 2022 -0800 @@ -37,7 +37,7 @@ #include "error.h" #include "variables.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (abs, args, , doc: /* -*- texinfo -*- @@ -2309,4 +2309,4 @@ DEFALIAS (gammaln, lgamma); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/matrix_type.cc --- a/libinterp/corefcn/matrix_type.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/matrix_type.cc Thu Dec 01 14:28:07 2022 -0800 @@ -39,7 +39,7 @@ #include "MatrixType.h" #include "oct-locbuf.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (matrix_type, args, , doc: /* -*- texinfo -*- @@ -578,4 +578,4 @@ %! assert (matrix_type (a), "Singular"); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/max.cc --- a/libinterp/corefcn/max.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/max.cc Thu Dec 01 14:28:07 2022 -0800 @@ -44,7 +44,7 @@ #include "ov-re-sparse.h" #include "ov-cx-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) template static octave_value_list @@ -1101,4 +1101,4 @@ %!error cummax (1, 2, 3) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/mex-private.h --- a/libinterp/corefcn/mex-private.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/mex-private.h Thu Dec 01 14:28:07 2022 -0800 @@ -28,12 +28,12 @@ #include "octave-config.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) extern OCTINTERP_API octave_value_list call_mex (octave_mex_function& mex_fcn, const octave_value_list& args, int nargout_arg); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/mex.cc --- a/libinterp/corefcn/mex.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/mex.cc Thu Dec 01 14:28:07 2022 -0800 @@ -4780,7 +4780,7 @@ typedef F77_RET_T (*fmex_fptr) (F77_INT& nlhs, mxArray **plhs, F77_INT& nrhs, mxArray **prhs); -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) octave_value_list call_mex (octave_mex_function& mex_fcn, const octave_value_list& args, @@ -4853,7 +4853,7 @@ return retval; } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) // C interface to mex functions: diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/mgorth.cc --- a/libinterp/corefcn/mgorth.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/mgorth.cc Thu Dec 01 14:28:07 2022 -0800 @@ -32,7 +32,7 @@ #include "error.h" #include "errwarn.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) template static void @@ -147,4 +147,4 @@ %! assert (a' * a, eye (5), 1e10); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/nproc.cc --- a/libinterp/corefcn/nproc.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/nproc.cc Thu Dec 01 14:28:07 2022 -0800 @@ -32,7 +32,7 @@ #include "defun.h" #include "error.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (nproc, args, , doc: /* -*- texinfo -*- @@ -112,4 +112,4 @@ %!error nproc ("no_valid_option") */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/oct-fstrm.cc --- a/libinterp/corefcn/oct-fstrm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/oct-fstrm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -33,7 +33,7 @@ #include "error.h" #include "oct-fstrm.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) stream fstream::create (const std::string& nm_arg, std::ios::openmode arg_md, @@ -111,4 +111,4 @@ return retval; } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/oct-fstrm.h --- a/libinterp/corefcn/oct-fstrm.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/oct-fstrm.h Thu Dec 01 14:28:07 2022 -0800 @@ -33,7 +33,7 @@ #include "oct-stream.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class fstream : public base_stream @@ -88,6 +88,6 @@ std::fstream m_fstream; }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/oct-hdf5-types.cc --- a/libinterp/corefcn/oct-hdf5-types.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/oct-hdf5-types.cc Thu Dec 01 14:28:07 2022 -0800 @@ -31,7 +31,7 @@ #include "errwarn.h" #include "oct-hdf5.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) bool check_hdf5_types (bool warn) @@ -70,4 +70,4 @@ return ok; } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/oct-hdf5-types.h --- a/libinterp/corefcn/oct-hdf5-types.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/oct-hdf5-types.h Thu Dec 01 14:28:07 2022 -0800 @@ -32,11 +32,11 @@ // This function only needs to be defined for C++. -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) extern bool check_hdf5_types (bool warn = true); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/oct-hist.cc --- a/libinterp/corefcn/oct-hist.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/oct-hist.cc Thu Dec 01 14:28:07 2022 -0800 @@ -70,7 +70,7 @@ #include "utils.h" #include "variables.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Read the edited history lines from STREAM and return them // one at a time. This can read unlimited length lines. The @@ -925,4 +925,4 @@ return retval; } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/oct-hist.h --- a/libinterp/corefcn/oct-hist.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/oct-hist.h Thu Dec 01 14:28:07 2022 -0800 @@ -34,7 +34,7 @@ #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class interpreter; @@ -114,6 +114,6 @@ } }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/oct-iostrm.cc --- a/libinterp/corefcn/oct-iostrm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/oct-iostrm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -33,7 +33,7 @@ #include "error.h" #include "oct-iostrm.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Position a stream at OFFSET relative to ORIGIN. @@ -97,4 +97,4 @@ return octave::stream (new ostream (arg, n)); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/oct-iostrm.h --- a/libinterp/corefcn/oct-iostrm.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/oct-iostrm.h Thu Dec 01 14:28:07 2022 -0800 @@ -32,7 +32,7 @@ #include "oct-stream.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class base_iostream : public base_stream @@ -159,6 +159,6 @@ ostream& operator = (const ostream&) = delete; }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/oct-opengl.h --- a/libinterp/corefcn/oct-opengl.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/oct-opengl.h Thu Dec 01 14:28:07 2022 -0800 @@ -50,8 +50,8 @@ #endif -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class opengl_functions { public: @@ -458,7 +458,8 @@ #endif }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/oct-prcstrm.cc --- a/libinterp/corefcn/oct-prcstrm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/oct-prcstrm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -32,7 +32,7 @@ #include "oct-prcstrm.h" #include "sysdep.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) octave::stream octave_iprocstream::create (const std::string& n, std::ios::openmode arg_md, @@ -76,4 +76,4 @@ do_close (); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/oct-prcstrm.h --- a/libinterp/corefcn/oct-prcstrm.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/oct-prcstrm.h Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ // already have classes with those names (see procstream.h). We need to // find a way to resolve this naming issue. -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class octave_iprocstream : public octave::stdiostream @@ -96,6 +96,6 @@ ~octave_oprocstream (void); }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/oct-procbuf.cc --- a/libinterp/corefcn/oct-procbuf.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/oct-procbuf.cc Thu Dec 01 14:28:07 2022 -0800 @@ -55,7 +55,7 @@ #include "errwarn.h" #include "utils.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) #if ! defined (SHELL_PATH) # define SHELL_PATH "/bin/sh" @@ -241,4 +241,4 @@ #endif } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/oct-procbuf.h --- a/libinterp/corefcn/oct-procbuf.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/oct-procbuf.h Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "c-file-ptr-stream.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class procbuf : public c_file_ptr_buf @@ -81,6 +81,6 @@ procbuf *m_next; }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/oct-process.cc --- a/libinterp/corefcn/oct-process.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/oct-process.cc Thu Dec 01 14:28:07 2022 -0800 @@ -31,8 +31,8 @@ #include "sysdep.h" #include "oct-syscalls.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + process_execution_result process_execution_result::of_success (int exit_status, const std::string& stdout_output) @@ -85,4 +85,5 @@ return process_execution_result::of_success (cmd_status, output_buf.str ()); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/oct-process.h --- a/libinterp/corefcn/oct-process.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/oct-process.h Thu Dec 01 14:28:07 2022 -0800 @@ -30,8 +30,8 @@ #include -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class process_execution_result { @@ -79,6 +79,7 @@ extern OCTINTERP_API process_execution_result run_command_and_return_output (const std::string& cmd_str); -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/oct-stdstrm.h --- a/libinterp/corefcn/oct-stdstrm.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/oct-stdstrm.h Thu Dec 01 14:28:07 2022 -0800 @@ -33,7 +33,7 @@ #include "oct-stream.h" #include "c-file-ptr-stream.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) template class @@ -197,6 +197,6 @@ #endif -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/oct-stream.cc --- a/libinterp/corefcn/oct-stream.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/oct-stream.cc Thu Dec 01 14:28:07 2022 -0800 @@ -67,8 +67,8 @@ #include "pager.h" #include "utils.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Programming Note: There are two very different error functions used // in the stream code. When invoked with "error (...)" the member // function from stream or base_stream is called. This @@ -7748,4 +7748,5 @@ { return octave_value (m_stderr_file); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/oct-stream.h --- a/libinterp/corefcn/oct-stream.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/oct-stream.h Thu Dec 01 14:28:07 2022 -0800 @@ -48,8 +48,8 @@ #include "data-conv.h" #include "mach-info.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class interpreter; // These are only needed as arguments to private functions, so they @@ -547,6 +547,7 @@ int m_stdout_file; int m_stderr_file; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/oct-strstrm.cc --- a/libinterp/corefcn/oct-strstrm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/oct-strstrm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -29,7 +29,7 @@ #include "oct-strstrm.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Position a stream at OFFSET relative to ORIGIN. @@ -77,4 +77,4 @@ return stream (new ostrstream (arg_md, flt_fmt, encoding)); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/oct-strstrm.h --- a/libinterp/corefcn/oct-strstrm.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/oct-strstrm.h Thu Dec 01 14:28:07 2022 -0800 @@ -33,7 +33,7 @@ #include "oct-stream.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class base_strstream : public base_stream @@ -192,6 +192,6 @@ std::ostringstream m_ostream; }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/oct-tex-lexer.in.ll --- a/libinterp/corefcn/oct-tex-lexer.in.ll Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/oct-tex-lexer.in.ll Thu Dec 01 14:28:07 2022 -0800 @@ -214,8 +214,8 @@ free (ptr); } -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + bool text_parser_tex::init_lexer (const std::string& s) { if (! m_scanner) @@ -252,4 +252,5 @@ m_scanner = nullptr; } } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/oct-tex-parser.yy --- a/libinterp/corefcn/oct-tex-parser.yy Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/oct-tex-parser.yy Thu Dec 01 14:28:07 2022 -0800 @@ -212,8 +212,8 @@ # pragma GCC diagnostic pop #endif -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + text_element* text_parser_tex::parse (const std::string& s) { @@ -229,7 +229,8 @@ return new text_element_string (s); } -} + +OCTAVE_END_NAMESPACE(octave) static void yyerror (octave::text_parser_tex&, const char *s) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/ordqz.cc --- a/libinterp/corefcn/ordqz.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/ordqz.cc Thu Dec 01 14:28:07 2022 -0800 @@ -53,7 +53,7 @@ #endif -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (ordqz, args, nargout, doc: /* -*- texinfo -*- @@ -679,4 +679,4 @@ */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/ordschur.cc --- a/libinterp/corefcn/ordschur.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/ordschur.cc Thu Dec 01 14:28:07 2022 -0800 @@ -32,7 +32,7 @@ #include "lo-lapack-proto.h" #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (ordschur, args, , doc: /* -*- texinfo -*- @@ -225,4 +225,4 @@ */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/pager.cc --- a/libinterp/corefcn/pager.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/pager.cc Thu Dec 01 14:28:07 2022 -0800 @@ -52,7 +52,7 @@ #include "utils.h" #include "variables.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) static bool pager_event_handler (pid_t pid, int status) @@ -753,4 +753,4 @@ return output_sys.PAGER_FLAGS (args, nargout); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/pager.h --- a/libinterp/corefcn/pager.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/pager.h Thu Dec 01 14:28:07 2022 -0800 @@ -36,7 +36,7 @@ class octave_value; class octave_value_list; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class interpreter; class oprocstream; @@ -309,7 +309,7 @@ extern OCTINTERP_API std::ostream& __diary__ (void); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #define octave_stdout (octave::__stdout__ ()) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/pinv.cc --- a/libinterp/corefcn/pinv.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/pinv.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "ov-flt-cx-diag.h" #include "ov-perm.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (pinv, args, , doc: /* -*- texinfo -*- @@ -223,4 +223,4 @@ */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/pow2.cc --- a/libinterp/corefcn/pow2.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/pow2.cc Thu Dec 01 14:28:07 2022 -0800 @@ -84,7 +84,7 @@ octave::err_nonconformant ("pow2", f.dims (), e.dims ()); } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (pow2, args, , doc: /* -*- texinfo -*- @@ -322,4 +322,4 @@ %!error pow2 (sparse ([1,2]), sparse ([3,4,5])) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/pr-flt-fmt.cc --- a/libinterp/corefcn/pr-flt-fmt.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/pr-flt-fmt.cc Thu Dec 01 14:28:07 2022 -0800 @@ -48,7 +48,7 @@ Voutput_precision = prec; } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (output_precision, args, nargout, doc: /* -*- texinfo -*- @@ -73,4 +73,4 @@ "output_precision", 0, 16); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/pr-output.cc --- a/libinterp/corefcn/pr-output.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/pr-output.cc Thu Dec 01 14:28:07 2022 -0800 @@ -3195,7 +3195,7 @@ panic_impossible (); } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (rats, args, , doc: /* -*- texinfo -*- @@ -4198,4 +4198,4 @@ "split_long_rows"); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/procstream.cc --- a/libinterp/corefcn/procstream.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/procstream.cc Thu Dec 01 14:28:07 2022 -0800 @@ -31,7 +31,7 @@ #include "procstream.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) procstreambase::procstreambase (const std::string& command, int mode) { @@ -74,4 +74,4 @@ return status; } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/procstream.h --- a/libinterp/corefcn/procstream.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/procstream.h Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "oct-procbuf.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class OCTINTERP_API @@ -185,6 +185,6 @@ procstream& operator = (const procstream&); }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/psi.cc --- a/libinterp/corefcn/psi.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/psi.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "lo-specfun.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (psi, args, , doc: /* -*- texinfo -*- @@ -236,4 +236,4 @@ */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/qr.cc --- a/libinterp/corefcn/qr.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/qr.cc Thu Dec 01 14:28:07 2022 -0800 @@ -41,7 +41,7 @@ #include "ov.h" #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) /* ## Restore all rand* "state" values @@ -2072,4 +2072,4 @@ %! assert (norm (vec (Q*R - AA(:,p)), Inf) < norm (AA)*1e1*eps ("single")); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/quad.cc --- a/libinterp/corefcn/quad.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/quad.cc Thu Dec 01 14:28:07 2022 -0800 @@ -46,7 +46,7 @@ #include "Quad-opts.cc" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Global pointer for user defined function required by quadrature functions. static octave_value quad_fcn; @@ -459,4 +459,4 @@ %!error quad_options (1, 2, 3) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/quadcc.cc --- a/libinterp/corefcn/quadcc.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/quadcc.cc Thu Dec 01 14:28:07 2022 -0800 @@ -45,7 +45,7 @@ // Extended debugging. #define DEBUG_QUADCC 0 -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Define the minimum size of the interval heap. static const int MIN_CQUAD_HEAPSIZE = 200; @@ -2273,4 +2273,4 @@ %!error (quadcc (@sin, 0, pi, 1e-6, [ i ])) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/qz.cc --- a/libinterp/corefcn/qz.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/qz.cc Thu Dec 01 14:28:07 2022 -0800 @@ -57,7 +57,7 @@ # include "pr-output.h" #endif -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // FIXME: Matlab does not produce lambda as the first output argument. // Compatibility problem? @@ -953,4 +953,4 @@ %! assert (all (abs (lambda(2:4)) >= 1)); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/rand.cc --- a/libinterp/corefcn/rand.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/rand.cc Thu Dec 01 14:28:07 2022 -0800 @@ -43,7 +43,7 @@ #include "utils.h" #include "ov-re-mat.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) /* %% Restore all rand* "seed" and "state" values in order, so that the @@ -1226,4 +1226,4 @@ %! endfor */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/rcond.cc --- a/libinterp/corefcn/rcond.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/rcond.cc Thu Dec 01 14:28:07 2022 -0800 @@ -33,7 +33,7 @@ #include "ovl.h" #include "utils.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (rcond, args, , doc: /* -*- texinfo -*- @@ -109,4 +109,4 @@ */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/regexp.cc --- a/libinterp/corefcn/regexp.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/regexp.cc Thu Dec 01 14:28:07 2022 -0800 @@ -44,7 +44,7 @@ #include "ovl.h" #include "utils.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Replace backslash escapes in a string with the real values. We need // two special functions instead of the one in utils.cc because the set @@ -1606,4 +1606,4 @@ %! "\nabc")); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/schur.cc --- a/libinterp/corefcn/schur.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/schur.cc Thu Dec 01 14:28:07 2022 -0800 @@ -37,7 +37,7 @@ #include "ovl.h" #include "utils.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) template static octave_value @@ -343,4 +343,4 @@ %! assert (U * T * U', A, 1e-14); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/settings.cc --- a/libinterp/corefcn/settings.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/settings.cc Thu Dec 01 14:28:07 2022 -0800 @@ -34,7 +34,7 @@ #include "settings.h" #include "variables.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) settings::settings (void) : m_display_tokens (false), m_token_count (0), @@ -96,4 +96,4 @@ return stgs.lexer_debug_flag (args, nargout); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/settings.h --- a/libinterp/corefcn/settings.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/settings.h Thu Dec 01 14:28:07 2022 -0800 @@ -33,7 +33,7 @@ class octave_value; class octave_value_list; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Most settings for the interpreter are stored in the classes which // they affect (intput_system, output_system, load_path, etc. Some @@ -92,6 +92,6 @@ bool m_lexer_debug_flag = false; }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/sighandlers.cc --- a/libinterp/corefcn/sighandlers.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/sighandlers.cc Thu Dec 01 14:28:07 2022 -0800 @@ -58,7 +58,7 @@ #include "utils.h" #include "variables.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Nonzero means we have already printed a message for this series of // SIGPIPES. We assume that the writer will eventually give up. @@ -639,4 +639,4 @@ %!error sigterm_dumps_octave_core (1, 2) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/sighandlers.h --- a/libinterp/corefcn/sighandlers.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/sighandlers.h Thu Dec 01 14:28:07 2022 -0800 @@ -40,7 +40,7 @@ #include "child-list.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // This type must match the typedef in signal-wrappers.h. typedef void sig_handler (int); @@ -81,6 +81,6 @@ // TRUE means we should try to enter the debugger on SIGINT. extern OCTINTERP_API bool Vdebug_on_interrupt; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/sparse-xdiv.cc --- a/libinterp/corefcn/sparse-xdiv.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/sparse-xdiv.cc Thu Dec 01 14:28:07 2022 -0800 @@ -43,7 +43,7 @@ #include "oct-spparms.h" #include "sparse-xdiv.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) static void solve_singularity_warning (double rcond) @@ -636,4 +636,4 @@ return do_leftdiv_dm_sm (d, a); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/sparse-xdiv.h --- a/libinterp/corefcn/sparse-xdiv.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/sparse-xdiv.h Thu Dec 01 14:28:07 2022 -0800 @@ -36,7 +36,7 @@ class SparseMatrix; class SparseComplexMatrix; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) extern Matrix xdiv (const Matrix& a, const SparseMatrix& b, MatrixType& typ); extern ComplexMatrix xdiv (const Matrix& a, const SparseComplexMatrix& b, @@ -102,6 +102,6 @@ const SparseComplexMatrix&, MatrixType&); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/sparse-xpow.cc --- a/libinterp/corefcn/sparse-xpow.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/sparse-xpow.cc Thu Dec 01 14:28:07 2022 -0800 @@ -45,7 +45,7 @@ #include "ov-cx-sparse.h" #include "sparse-xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) static inline bool xisint (double x) @@ -843,4 +843,4 @@ } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/sparse-xpow.h --- a/libinterp/corefcn/sparse-xpow.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/sparse-xpow.h Thu Dec 01 14:28:07 2022 -0800 @@ -34,7 +34,7 @@ class SparseComplexMatrix; class octave_value; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) extern octave_value xpow (const SparseMatrix& a, double b); extern octave_value xpow (const SparseComplexMatrix& a, double b); @@ -60,6 +60,6 @@ extern octave_value elem_xpow (const SparseComplexMatrix& a, const SparseComplexMatrix& b); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/sparse.cc --- a/libinterp/corefcn/sparse.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/sparse.cc Thu Dec 01 14:28:07 2022 -0800 @@ -42,7 +42,7 @@ #include "ov-cx-sparse.h" #include "ov-bool-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (issparse, args, , doc: /* -*- texinfo -*- @@ -325,4 +325,4 @@ %!error spalloc (1, 1, -1) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/spparms.cc --- a/libinterp/corefcn/spparms.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/spparms.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "oct-spparms.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (spparms, args, nargout, doc: /* -*- texinfo -*- @@ -202,4 +202,4 @@ %!error spparms ("UNKNOWN_KEY", 1) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/sqrtm.cc --- a/libinterp/corefcn/sqrtm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/sqrtm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "utils.h" #include "xnorm.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) template static void @@ -278,4 +278,4 @@ %! assert (err, 0); # Yes, this one has to hold exactly */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/stack-frame.cc --- a/libinterp/corefcn/stack-frame.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/stack-frame.cc Thu Dec 01 14:28:07 2022 -0800 @@ -48,8 +48,8 @@ #include "symscope.h" #include "variables.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class compiled_fcn_stack_frame : public stack_frame { public: @@ -2490,4 +2490,5 @@ { sfw.visit_scope_stack_frame (*this); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/stack-frame.h --- a/libinterp/corefcn/stack-frame.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/stack-frame.h Thu Dec 01 14:28:07 2022 -0800 @@ -97,8 +97,8 @@ // executed. This pointer should only point to a parent function // stack frame. -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class tree_evaluator; class symbol_info_list; class unwind_protect; @@ -594,6 +594,7 @@ // in the call stack. std::string m_dispatch_class; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/stream-euler.cc --- a/libinterp/corefcn/stream-euler.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/stream-euler.cc Thu Dec 01 14:28:07 2022 -0800 @@ -53,7 +53,7 @@ #include "error.h" #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Coordinates of a point in C-Space (unit square mesh) @@ -534,4 +534,4 @@ return streameuler3d_internal (args, "__streameuler3d__"); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/strfind.cc --- a/libinterp/corefcn/strfind.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/strfind.cc Thu Dec 01 14:28:07 2022 -0800 @@ -43,7 +43,7 @@ #include "unwind-prot.h" #include "utils.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // This allows safe indexing with char. // In C++, char may be (and often is) signed! @@ -521,4 +521,4 @@ %!error strrep ("A", "B", 1.0) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/strfns.cc --- a/libinterp/corefcn/strfns.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/strfns.cc Thu Dec 01 14:28:07 2022 -0800 @@ -48,7 +48,7 @@ #include "oct-string.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (char, args, , doc: /* -*- texinfo -*- @@ -1258,4 +1258,4 @@ %!error list_in_columns (["abc", "def"], "a") */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/sub2ind.cc --- a/libinterp/corefcn/sub2ind.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/sub2ind.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "errwarn.h" #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) static dim_vector get_dim_vector (const octave_value& val, const char *name) @@ -335,4 +335,4 @@ %!error ind2sub ([2, 2, 2], -1:8) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/svd.cc --- a/libinterp/corefcn/svd.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/svd.cc Thu Dec 01 14:28:07 2022 -0800 @@ -37,7 +37,7 @@ #include "utils.h" #include "variables.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) static std::string Vsvd_driver = "gesvd"; @@ -462,4 +462,4 @@ %! assert (V1, V3 .* z, 100*eps); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/sylvester.cc --- a/libinterp/corefcn/sylvester.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/sylvester.cc Thu Dec 01 14:28:07 2022 -0800 @@ -32,7 +32,7 @@ #include "errwarn.h" #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (sylvester, args, , doc: /* -*- texinfo -*- @@ -173,4 +173,4 @@ %!error sylvester (ones (2,2), ones (2,2), ones (3,3)) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/symbfact.cc --- a/libinterp/corefcn/symbfact.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/symbfact.cc Thu Dec 01 14:28:07 2022 -0800 @@ -48,7 +48,7 @@ #include "parse.h" #include "utils.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (symbfact, args, nargout, doc: /* -*- texinfo -*- @@ -433,4 +433,4 @@ */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/syminfo.cc --- a/libinterp/corefcn/syminfo.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/syminfo.cc Thu Dec 01 14:28:07 2022 -0800 @@ -40,8 +40,8 @@ #include "pager.h" #include "syminfo.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + void symbol_info::display_line (std::ostream& os, const std::list& params) const @@ -576,4 +576,5 @@ return params; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/syminfo.h --- a/libinterp/corefcn/syminfo.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/syminfo.h Thu Dec 01 14:28:07 2022 -0800 @@ -37,8 +37,8 @@ class octave_map; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + struct whos_parameter { char command; @@ -123,6 +123,7 @@ std::list parse_whos_line_format (const std::string& format) const; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/symrcm.cc --- a/libinterp/corefcn/symrcm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/symrcm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -72,7 +72,7 @@ #include "ov.h" #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // A node struct for the Cuthill-McKee algorithm struct CMK_Node @@ -706,4 +706,4 @@ return ovl (P+1); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/symrec.cc --- a/libinterp/corefcn/symrec.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/symrec.cc Thu Dec 01 14:28:07 2022 -0800 @@ -39,8 +39,8 @@ #include "interpreter.h" #include "symrec.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + std::shared_ptr symbol_record::symbol_record_rep::dup (void) const { @@ -59,4 +59,5 @@ return octave_value (m); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/symrec.h --- a/libinterp/corefcn/symrec.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/symrec.h Thu Dec 01 14:28:07 2022 -0800 @@ -38,8 +38,8 @@ #include "ov.h" #include "ovl.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class symbol_scope_rep; class symbol_record @@ -238,6 +238,7 @@ : m_rep (new_rep) { } }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/symscope.cc --- a/libinterp/corefcn/symscope.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/symscope.cc Thu Dec 01 14:28:07 2022 -0800 @@ -40,8 +40,8 @@ #include "symscope.h" #include "utils.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + symbol_record symbol_scope_rep::insert_local (const std::string& name) { symbol_record sym (name); @@ -385,4 +385,5 @@ return ppsr->localfunctions (); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/symscope.h --- a/libinterp/corefcn/symscope.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/symscope.h Thu Dec 01 14:28:07 2022 -0800 @@ -46,8 +46,8 @@ #include "ovl.h" #include "symrec.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class symbol_scope; class symbol_scope_rep @@ -725,6 +725,7 @@ std::shared_ptr m_rep; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/symtab.cc --- a/libinterp/corefcn/symtab.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/symtab.cc Thu Dec 01 14:28:07 2022 -0800 @@ -48,7 +48,7 @@ #include "symscope.h" #include "symtab.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) symbol_table::symbol_table (interpreter& interp) : m_interpreter (interp), m_fcn_table (), m_class_precedence_table (), @@ -848,5 +848,5 @@ %! assert (! strcmp (which ("bar"), "")); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/symtab.h --- a/libinterp/corefcn/symtab.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/symtab.h Thu Dec 01 14:28:07 2022 -0800 @@ -46,7 +46,7 @@ #include "ovl.h" #include "symscope.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class interpreter; @@ -228,6 +228,6 @@ void install_builtins (void); }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/syscalls.cc --- a/libinterp/corefcn/syscalls.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/syscalls.cc Thu Dec 01 14:28:07 2022 -0800 @@ -59,7 +59,7 @@ #include "utils.h" #include "variables.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) static octave_scalar_map mk_stat_map (const sys::base_file_stat& fs) @@ -1745,4 +1745,4 @@ return const_value (args, sys::wcontinue ()); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/sysdep.cc --- a/libinterp/corefcn/sysdep.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/sysdep.cc Thu Dec 01 14:28:07 2022 -0800 @@ -103,7 +103,7 @@ #endif -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) #if defined (__386BSD__) || defined (__FreeBSD__) || defined (__NetBSD__) @@ -1490,4 +1490,4 @@ return ovl (sys::lapack_version ()); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/sysdep.h --- a/libinterp/corefcn/sysdep.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/sysdep.h Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "lo-ieee.h" #include "lo-sysdep.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) extern OCTINTERP_API void sysdep_init (void); @@ -58,6 +58,6 @@ extern OCTINTERP_API bool drive_or_unc_share (const std::string&); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/text-engine.cc --- a/libinterp/corefcn/text-engine.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/text-engine.cc Thu Dec 01 14:28:07 2022 -0800 @@ -30,8 +30,8 @@ #include "text-engine.h" #include "oct-tex-symbols.cc" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + uint32_t text_element_symbol::get_symbol_code (void) const { @@ -42,4 +42,5 @@ return code; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/text-engine.h --- a/libinterp/corefcn/text-engine.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/text-engine.h Thu Dec 01 14:28:07 2022 -0800 @@ -35,8 +35,8 @@ #include "caseless-str.h" #include "dMatrix.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class text_element; class text_element_string; class text_element_symbol; @@ -469,6 +469,7 @@ return parser->parse (s); } -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/text-renderer.cc --- a/libinterp/corefcn/text-renderer.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/text-renderer.cc Thu Dec 01 14:28:07 2022 -0800 @@ -34,8 +34,8 @@ #include "latex-text-renderer.h" #include "text-renderer.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + text_renderer::text_renderer (void) : m_rep (make_ft_text_renderer ()), m_latex_rep (make_latex_text_renderer ()) @@ -172,4 +172,5 @@ lst = empty_lst; } } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/text-renderer.h --- a/libinterp/corefcn/text-renderer.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/text-renderer.h Thu Dec 01 14:28:07 2022 -0800 @@ -36,8 +36,8 @@ #include "dMatrix.h" #include "uint8NDArray.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_text_renderer; class text_element; @@ -237,6 +237,7 @@ base_text_renderer *m_rep; base_text_renderer *m_latex_rep; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/time.cc --- a/libinterp/corefcn/time.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/time.cc Thu Dec 01 14:28:07 2022 -0800 @@ -36,7 +36,7 @@ #include "ov.h" #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Date and time functions. @@ -520,4 +520,4 @@ %!error strptime () */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/toplev.cc --- a/libinterp/corefcn/toplev.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/toplev.cc Thu Dec 01 14:28:07 2022 -0800 @@ -71,7 +71,7 @@ # define SHELL_PATH "/bin/sh" #endif -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) #define STRINGIFY(s) STRINGIFY1(s) #define STRINGIFY1(s) #s @@ -645,7 +645,7 @@ %!error __octave_config_info__ (1, 2) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #if defined (__GNUG__) && defined (DEBUG_NEW_DELETE) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/tril.cc --- a/libinterp/corefcn/tril.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/tril.cc Thu Dec 01 14:28:07 2022 -0800 @@ -39,7 +39,7 @@ #include "error.h" #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // The bulk of the work. template @@ -483,4 +483,4 @@ %!error triu () */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/tsearch.cc --- a/libinterp/corefcn/tsearch.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/tsearch.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "error.h" #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) inline double max (double a, double b, double c) { @@ -175,4 +175,4 @@ %!error tsearch () */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/typecast.cc --- a/libinterp/corefcn/typecast.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/typecast.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "ovl.h" #include "unwind-prot.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) static dim_vector get_vec_dims (const dim_vector& old_dims, octave_idx_type n) @@ -588,4 +588,4 @@ %!error bitunpack ({}) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/url-handle-manager.cc --- a/libinterp/corefcn/url-handle-manager.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/url-handle-manager.cc Thu Dec 01 14:28:07 2022 -0800 @@ -33,8 +33,8 @@ #include "url-handle-manager.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + static double make_handle_fraction (void) { @@ -89,4 +89,5 @@ (std::ceil (h.value ()) - make_handle_fraction ()); } } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/url-handle-manager.h --- a/libinterp/corefcn/url-handle-manager.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/url-handle-manager.h Thu Dec 01 14:28:07 2022 -0800 @@ -40,8 +40,8 @@ #include "oct-handle.h" #include "url-transfer.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + typedef octave_handle url_handle; class OCTINTERP_API url_handle_manager @@ -143,6 +143,7 @@ // The next handle available if handle_free_list is empty. double m_next_handle; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/urlwrite.cc --- a/libinterp/corefcn/urlwrite.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/urlwrite.cc Thu Dec 01 14:28:07 2022 -0800 @@ -52,7 +52,7 @@ #include "unwind-prot.h" #include "url-handle-manager.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (urlwrite, args, nargout, doc: /* -*- texinfo -*- @@ -357,4 +357,4 @@ return ovl (content.str ()); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/utils.cc --- a/libinterp/corefcn/utils.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/utils.cc Thu Dec 01 14:28:07 2022 -0800 @@ -71,7 +71,7 @@ #include "utils.h" #include "variables.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Return TRUE if S is a valid identifier. @@ -1759,4 +1759,4 @@ %!error isstudent (1) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/utils.h --- a/libinterp/corefcn/utils.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/utils.h Thu Dec 01 14:28:07 2022 -0800 @@ -41,7 +41,7 @@ class octave_value_list; class string_vector; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) extern OCTINTERP_API bool valid_identifier (const char *s); extern OCTINTERP_API bool valid_identifier (const std::string& s); @@ -190,6 +190,6 @@ do_simple_cellfun (octave_value_list (*fcn) (const octave_value_list&, int), const char *fcn_name, const octave_value_list& args); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/variables.cc --- a/libinterp/corefcn/variables.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/variables.cc Thu Dec 01 14:28:07 2022 -0800 @@ -119,7 +119,7 @@ return ans; } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFMETHOD (isglobal, interp, args, , doc: /* -*- texinfo -*- @@ -1520,4 +1520,4 @@ "missing_component_hook"); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/variables.h --- a/libinterp/corefcn/variables.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/variables.h Thu Dec 01 14:28:07 2022 -0800 @@ -36,10 +36,11 @@ class octave_builtin; class string_vector; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class tree_identifier; -} + +OCTAVE_END_NAMESPACE(octave) #include #include @@ -61,7 +62,7 @@ is_valid_function (const std::string&, const std::string& = "", bool warn = false); -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) extern OCTINTERP_API int symbol_exist (const std::string& name, const std::string& type = "any"); @@ -104,7 +105,7 @@ extern OCTINTERP_API std::string maybe_missing_function_hook (const std::string& name); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) // The following macros should also be considered obsolete. diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/xdiv.cc --- a/libinterp/corefcn/xdiv.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/xdiv.cc Thu Dec 01 14:28:07 2022 -0800 @@ -49,7 +49,7 @@ #include "error.h" #include "xdiv.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) static void solve_singularity_warning (double rcond) @@ -1011,4 +1011,4 @@ xleftdiv (const FloatComplexDiagMatrix& a, const FloatComplexDiagMatrix& b) { return dmdm_leftdiv_impl (a, b); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/xdiv.h --- a/libinterp/corefcn/xdiv.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/xdiv.h Thu Dec 01 14:28:07 2022 -0800 @@ -31,7 +31,7 @@ #include "mx-defs.h" #include "MatrixType.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) extern Matrix xdiv (const Matrix& a, const Matrix& b, MatrixType& typ); extern ComplexMatrix xdiv (const Matrix& a, const ComplexMatrix& b, @@ -154,6 +154,6 @@ extern FloatComplexDiagMatrix xleftdiv (const FloatComplexDiagMatrix& a, const FloatComplexDiagMatrix& b); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/xnorm.cc --- a/libinterp/corefcn/xnorm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/xnorm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -33,7 +33,7 @@ #include "ov.h" #include "xnorm.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) octave_value xnorm (const octave_value& x, const octave_value& p) { @@ -203,4 +203,4 @@ return retval; } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/xnorm.h --- a/libinterp/corefcn/xnorm.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/xnorm.h Thu Dec 01 14:28:07 2022 -0800 @@ -32,7 +32,7 @@ class octave_value; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) extern OCTINTERP_API octave_value xnorm (const octave_value& x, const octave_value& p); @@ -46,6 +46,6 @@ extern OCTINTERP_API octave_value xfrobnorm (const octave_value& x); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/xpow.cc --- a/libinterp/corefcn/xpow.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/xpow.cc Thu Dec 01 14:28:07 2022 -0800 @@ -56,7 +56,7 @@ #include "bsxfun.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) static void err_failed_diagonalization (void) @@ -2824,4 +2824,4 @@ return result; } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/corefcn/xpow.h --- a/libinterp/corefcn/xpow.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/corefcn/xpow.h Thu Dec 01 14:28:07 2022 -0800 @@ -45,7 +45,7 @@ class FloatComplexNDArray; class octave_value; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) extern OCTINTERP_API octave_value xpow (double a, double b); extern OCTINTERP_API octave_value xpow (double a, const Matrix& b); @@ -206,6 +206,6 @@ extern OCTINTERP_API octave_value elem_xpow (const FloatComplexNDArray& a, const FloatComplexNDArray& b); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/dldfcn/__delaunayn__.cc --- a/libinterp/dldfcn/__delaunayn__.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/dldfcn/__delaunayn__.cc Thu Dec 01 14:28:07 2022 -0800 @@ -68,7 +68,7 @@ # endif #endif -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) #if defined (HAVE_QHULL) @@ -250,4 +250,4 @@ %!assert (1) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/dldfcn/__fltk_uigetfile__.cc --- a/libinterp/dldfcn/__fltk_uigetfile__.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/dldfcn/__fltk_uigetfile__.cc Thu Dec 01 14:28:07 2022 -0800 @@ -54,7 +54,7 @@ #include "errwarn.h" #include "ov.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN_DLD (__fltk_uigetfile__, args, , doc: /* -*- texinfo -*- @@ -161,4 +161,4 @@ %!assert (1) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/dldfcn/__glpk__.cc --- a/libinterp/dldfcn/__glpk__.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/dldfcn/__glpk__.cc Thu Dec 01 14:28:07 2022 -0800 @@ -307,7 +307,7 @@ #endif -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) #define OCTAVE_GLPK_GET_REAL_PARAM(NAME, VAL) \ do \ @@ -646,4 +646,4 @@ %!assert (1) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/dldfcn/__init_fltk__.cc --- a/libinterp/dldfcn/__init_fltk__.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/dldfcn/__init_fltk__.cc Thu Dec 01 14:28:07 2022 -0800 @@ -105,7 +105,7 @@ #include "parse.h" #include "variables.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) #if defined (HAVE_FLTK) @@ -2553,4 +2553,4 @@ %!assert (1) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/dldfcn/__init_gnuplot__.cc --- a/libinterp/dldfcn/__init_gnuplot__.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/dldfcn/__init_gnuplot__.cc Thu Dec 01 14:28:07 2022 -0800 @@ -57,7 +57,7 @@ // PKG_ADD: if (__have_gnuplot__ ()) register_graphics_toolkit ("gnuplot"); endif -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class gnuplot_graphics_toolkit : public octave::base_graphics_toolkit { @@ -282,4 +282,4 @@ %!assert (1) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/dldfcn/__ode15__.cc --- a/libinterp/dldfcn/__ode15__.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/dldfcn/__ode15__.cc Thu Dec 01 14:28:07 2022 -0800 @@ -82,7 +82,7 @@ #endif -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) #if defined (HAVE_SUNDIALS) @@ -1351,4 +1351,4 @@ %!assert (1) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/dldfcn/__voronoi__.cc --- a/libinterp/dldfcn/__voronoi__.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/dldfcn/__voronoi__.cc Thu Dec 01 14:28:07 2022 -0800 @@ -63,7 +63,7 @@ # endif #endif -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) #if defined (HAVE_QHULL) @@ -347,4 +347,4 @@ %!assert (1) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/dldfcn/audiodevinfo.cc --- a/libinterp/dldfcn/audiodevinfo.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/dldfcn/audiodevinfo.cc Thu Dec 01 14:28:07 2022 -0800 @@ -54,7 +54,7 @@ # include #endif -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) #if defined (HAVE_PORTAUDIO) @@ -2810,4 +2810,4 @@ #endif } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/dldfcn/audioread.cc --- a/libinterp/dldfcn/audioread.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/dldfcn/audioread.cc Thu Dec 01 14:28:07 2022 -0800 @@ -49,7 +49,7 @@ # include #endif -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN_DLD (audioread, args, , doc: /* -*- texinfo -*- @@ -793,4 +793,4 @@ #endif } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/dldfcn/convhulln.cc --- a/libinterp/dldfcn/convhulln.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/dldfcn/convhulln.cc Thu Dec 01 14:28:07 2022 -0800 @@ -86,7 +86,7 @@ #endif -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN_DLD (convhulln, args, nargout, doc: /* -*- texinfo -*- @@ -334,4 +334,4 @@ %! assert (size (h), [3 2]); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/dldfcn/fftw.cc --- a/libinterp/dldfcn/fftw.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/dldfcn/fftw.cc Thu Dec 01 14:28:07 2022 -0800 @@ -41,7 +41,7 @@ #include "errwarn.h" #include "ov.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN_DLD (fftw, args, , doc: /* -*- texinfo -*- @@ -401,4 +401,4 @@ %!error fftw ("threads", -3) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/dldfcn/gzip.cc --- a/libinterp/dldfcn/gzip.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/dldfcn/gzip.cc Thu Dec 01 14:28:07 2022 -0800 @@ -83,7 +83,7 @@ # include #endif -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) //! RIIA wrapper for std::FILE*. //! @@ -861,4 +861,4 @@ %!test run_test_function (@test_save_to_dir) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/mk-build-env-features.sh --- a/libinterp/mk-build-env-features.sh Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/mk-build-env-features.sh Thu Dec 01 14:28:07 2022 -0800 @@ -43,10 +43,10 @@ #include "build-env.h" #include "ov.h" -namespace octave -{ - namespace build_env - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(build_env) + octave_scalar_map features (void) { @@ -82,6 +82,7 @@ return m; } - }; -}; + +OCTAVE_END_NAMESPACE(build_env) +OCTAVE_END_NAMESPACE(octave) EOF diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/mk-builtins.pl --- a/libinterp/mk-builtins.pl Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/mk-builtins.pl Thu Dec 01 14:28:07 2022 -0800 @@ -116,7 +116,7 @@ #include \"ovl.h\" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class interpreter; @@ -148,7 +148,7 @@ "; } - print "\nOCTAVE_NAMESPACE_END\n"; + print "\nOCTAVE_END_NAMESPACE(octave)\n"; print "\n#endif\n"; } @@ -166,8 +166,9 @@ #include \"symtab.h\" #include \"variables.h\" -namespace octave -{"; +OCTAVE_BEGIN_NAMESPACE(octave) + +"; @installer_functions = (); @@ -305,5 +306,6 @@ print " $fcn (*this);\n" } - print " }\n}\n"; + print " }\n"; + print "OCTAVE_END_NAMESPACE(octave)\n"; } diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/cdef-class.cc --- a/libinterp/octave-value/cdef-class.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/cdef-class.cc Thu Dec 01 14:28:07 2022 -0800 @@ -60,8 +60,8 @@ # include #endif -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + static octave_value make_fcn_handle (const octave_value& fcn, const std::string& meth_name, const std::string& class_name) @@ -1170,4 +1170,5 @@ { return octave_value (new octave_classdef_meta (*this)); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/cdef-class.h --- a/libinterp/octave-value/cdef-class.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/cdef-class.h Thu Dec 01 14:28:07 2022 -0800 @@ -43,8 +43,8 @@ #include "ov.h" #include "ovl.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class interpreter; class tree_classdef; @@ -467,6 +467,7 @@ { return get_rep ()->find_property (nm); } -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/cdef-fwd.h --- a/libinterp/octave-value/cdef-fwd.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/cdef-fwd.h Thu Dec 01 14:28:07 2022 -0800 @@ -28,11 +28,12 @@ #include "octave-config.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class OCTINTERP_API cdef_class; class OCTINTERP_API cdef_object; class OCTINTERP_API cdef_package; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/cdef-manager.cc --- a/libinterp/octave-value/cdef-manager.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/cdef-manager.cc Thu Dec 01 14:28:07 2022 -0800 @@ -32,8 +32,8 @@ #include "interpreter.h" #include "ov-classdef.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + static octave_value make_fcn_handle (octave_builtin::fcn ff, const std::string& nm) { @@ -946,4 +946,5 @@ return cls.get_method (name); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/cdef-manager.h --- a/libinterp/octave-value/cdef-manager.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/cdef-manager.h Thu Dec 01 14:28:07 2022 -0800 @@ -35,8 +35,8 @@ #include "cdef-property.h" #include "ov-builtin.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class interpreter; class @@ -159,6 +159,7 @@ cdef_package m_meta; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/cdef-method.cc --- a/libinterp/octave-value/cdef-method.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/cdef-method.cc Thu Dec 01 14:28:07 2022 -0800 @@ -49,8 +49,8 @@ #include "pt-stmt.h" #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + OCTAVE_NORETURN static void err_method_access (const std::string& from, const cdef_method& meth) @@ -231,4 +231,5 @@ return retval; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/cdef-method.h --- a/libinterp/octave-value/cdef-method.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/cdef-method.h Thu Dec 01 14:28:07 2022 -0800 @@ -37,8 +37,8 @@ #include "cdef-object.h" #include "ov.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class OCTINTERP_API cdef_method : public cdef_meta_object @@ -227,6 +227,7 @@ return dynamic_cast (cdef_object::get_rep ()); } }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/cdef-object.cc --- a/libinterp/octave-value/cdef-object.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/cdef-object.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,8 +38,8 @@ // Define to 1 to enable debugging statements. #define DEBUG_TRACE 0 -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + void cdef_object_rep::release (const cdef_object& obj) { @@ -750,4 +750,5 @@ << " object (value)" << std::endl; #endif } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/cdef-object.h --- a/libinterp/octave-value/cdef-object.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/cdef-object.h Thu Dec 01 14:28:07 2022 -0800 @@ -39,8 +39,8 @@ #include "ov.h" #include "ovl.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // This is mainly a bootstrap class to declare the expected interface. // The actual base class is cdef_class_base, which is declared after // cdef_object, such that it can contain cdef_object objects. @@ -711,6 +711,7 @@ return dynamic_cast (cdef_object::get_rep ()); } }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/cdef-package.cc --- a/libinterp/octave-value/cdef-package.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/cdef-package.cc Thu Dec 01 14:28:07 2022 -0800 @@ -51,8 +51,8 @@ // Define to 1 to enable debugging statements. #define DEBUG_TRACE 0 -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + void cdef_package::cdef_package_rep::install_class (const cdef_class& cls, const std::string& nm) @@ -199,4 +199,5 @@ if (this != cdm.meta ().get_rep ()) cdm.unregister_package (wrap ()); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/cdef-package.h --- a/libinterp/octave-value/cdef-package.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/cdef-package.h Thu Dec 01 14:28:07 2022 -0800 @@ -38,8 +38,8 @@ #include "cdef-object.h" #include "ov.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class interpreter; class @@ -229,6 +229,7 @@ friend void install_classdef (octave::interpreter& interp); }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/cdef-property.cc --- a/libinterp/octave-value/cdef-property.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/cdef-property.cc Thu Dec 01 14:28:07 2022 -0800 @@ -50,8 +50,8 @@ #include "pt-stmt.h" #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + static bool is_method_executing (const octave_value& ov, const cdef_object& obj) { @@ -248,4 +248,5 @@ return false; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/cdef-property.h --- a/libinterp/octave-value/cdef-property.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/cdef-property.h Thu Dec 01 14:28:07 2022 -0800 @@ -38,8 +38,8 @@ #include "error.h" #include "ov.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class OCTINTERP_API cdef_property : public cdef_meta_object @@ -180,6 +180,7 @@ return dynamic_cast (cdef_object::get_rep ()); } }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/cdef-utils.cc --- a/libinterp/octave-value/cdef-utils.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/cdef-utils.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,8 +38,8 @@ #include "ov-usr-fcn.h" #include "pt-eval.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + std::string get_base_name (const std::string& nm) { @@ -402,4 +402,5 @@ return false; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/cdef-utils.h --- a/libinterp/octave-value/cdef-utils.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/cdef-utils.h Thu Dec 01 14:28:07 2022 -0800 @@ -36,8 +36,8 @@ class octave_value; class Cell; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + extern OCTINTERP_API std::string get_base_name (const std::string& nm); @@ -106,6 +106,7 @@ const std::string& meth_name = "", const std::string& prop_name = "", bool is_prop_set = false); -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-base.cc --- a/libinterp/octave-value/ov-base.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-base.cc Thu Dec 01 14:28:07 2022 -0800 @@ -1535,7 +1535,7 @@ return (fcn && fcn->name () == "builtin"); } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) void install_base_type_conversions (octave::type_info& ti) @@ -1558,4 +1558,4 @@ INSTALL_WIDENOP_TI (ti, octave_base_value, octave_cell, cell_conv); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-base.h --- a/libinterp/octave-value/ov-base.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-base.h Thu Dec 01 14:28:07 2022 -0800 @@ -44,8 +44,8 @@ #include "oct-hdf5-types.h" #include "oct-stream.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class stack_frame; class type_info; @@ -61,7 +61,8 @@ // This function is currently an internal, private function. Additional // changes may be made before version 8 is finally released. inline type_info& __get_type_info__ (const std::string&) { return __get_type_info__ (); } -} + +OCTAVE_END_NAMESPACE(octave) class Cell; class float_display_format; diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-bool-mat.cc --- a/libinterp/octave-value/ov-bool-mat.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-bool-mat.cc Thu Dec 01 14:28:07 2022 -0800 @@ -583,7 +583,7 @@ return retval; } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (logical, args, , doc: /* -*- texinfo -*- @@ -634,4 +634,4 @@ %! endfor */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-builtin.h --- a/libinterp/octave-value/ov-builtin.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-builtin.h Thu Dec 01 14:28:07 2022 -0800 @@ -38,11 +38,12 @@ class octave_value; class octave_value_list; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class tree_evaluator; class interpreter; -} + +OCTAVE_END_NAMESPACE(octave) // Builtin functions. diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-cell.cc --- a/libinterp/octave-value/ov-cell.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-cell.cc Thu Dec 01 14:28:07 2022 -0800 @@ -1220,7 +1220,7 @@ return retval; } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (iscell, args, , doc: /* -*- texinfo -*- @@ -1427,7 +1427,7 @@ %! assert (fieldnames (s), keys'); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) mxArray * octave_cell::as_mxArray (bool interleaved) const diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-class.cc --- a/libinterp/octave-value/ov-class.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-class.cc Thu Dec 01 14:28:07 2022 -0800 @@ -1712,7 +1712,7 @@ return true; } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFMETHOD (class, interp, args, , doc: /* -*- texinfo -*- @@ -2146,4 +2146,4 @@ return octave_value (new octave_inline (args(0).map_value ())); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-class.h --- a/libinterp/octave-value/ov-class.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-class.h Thu Dec 01 14:28:07 2022 -0800 @@ -40,10 +40,11 @@ #include "oct-map.h" #include "ov-base.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class type_info; -} + +OCTAVE_END_NAMESPACE(octave) class octave_value_list; diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-classdef.cc --- a/libinterp/octave-value/ov-classdef.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-classdef.cc Thu Dec 01 14:28:07 2022 -0800 @@ -599,7 +599,7 @@ return false; } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (__meta_get_package__, args, , doc: /* -*- texinfo -*- @@ -772,5 +772,5 @@ return ovl (Cell (sv)); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-classdef.h --- a/libinterp/octave-value/ov-classdef.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-classdef.h Thu Dec 01 14:28:07 2022 -0800 @@ -34,13 +34,14 @@ #include "ov-base.h" #include "ov-fcn.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class cdef_object; class interpreter; class tree_evaluator; class type_info; -} + +OCTAVE_END_NAMESPACE(octave) class octave_classdef : public octave_base_value diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-complex.cc --- a/libinterp/octave-value/ov-complex.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-complex.cc Thu Dec 01 14:28:07 2022 -0800 @@ -65,8 +65,8 @@ DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_complex, "complex scalar", "double"); -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Complain if a complex value is used as a subscript. class complex_index_exception : public index_exception @@ -94,7 +94,8 @@ return "Octave:invalid-index"; } }; -} + +OCTAVE_END_NAMESPACE(octave) static octave_base_value * default_numeric_demotion_function (const octave_base_value& a) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-fcn-handle.cc --- a/libinterp/octave-value/ov-fcn-handle.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-fcn-handle.cc Thu Dec 01 14:28:07 2022 -0800 @@ -84,7 +84,7 @@ const std::string octave_fcn_handle::anonymous ("@"); -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class invalid_fcn_handle : public base_fcn_handle { @@ -2811,7 +2811,7 @@ return false; } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) octave_fcn_handle::octave_fcn_handle (void) : octave_base_value (), m_rep (new octave::invalid_fcn_handle ()) @@ -3403,7 +3403,7 @@ return false; } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (functions, args, , doc: /* -*- texinfo -*- @@ -3647,4 +3647,4 @@ %! assert (__f (@(i) x(:,i), 1), [1;3]); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-fcn-handle.h --- a/libinterp/octave-value/ov-fcn-handle.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-fcn-handle.h Thu Dec 01 14:28:07 2022 -0800 @@ -40,7 +40,7 @@ #include "stack-frame.h" #include "symscope.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class interpreter; class tree_evaluator; @@ -169,7 +169,7 @@ std::string m_file; }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) class OCTINTERP_API diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-fcn.h --- a/libinterp/octave-value/ov-fcn.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-fcn.h Thu Dec 01 14:28:07 2022 -0800 @@ -38,12 +38,13 @@ #include "ov-typeinfo.h" #include "symscope.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class stack_frame; class tree_evaluator; class tree_walker; -} + +OCTAVE_END_NAMESPACE(octave) // Functions. diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-java.cc --- a/libinterp/octave-value/ov-java.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-java.cc Thu Dec 01 14:28:07 2022 -0800 @@ -224,7 +224,7 @@ bool Vjava_unsigned_autoconversion = true; bool Vdebug_java = false; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class JVMArgs { @@ -319,7 +319,7 @@ std::list m_java_opts; }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) //! The java initialization directory is given by the environment variable //! @c OCTAVE_JAVA_DIR if defined; otherwise it is the directory of Octave's @@ -535,12 +535,12 @@ #if defined (OCTAVE_USE_WINDOWS_API) -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_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); -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) static std::string get_jvm_lib_path_from_registry () @@ -3029,7 +3029,7 @@ #endif } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // DEFUN blocks below must be outside of HAVE_JAVA block so that documentation // strings are always available, even when functions are not. @@ -3610,4 +3610,4 @@ %! assert (frame.isResizable ()); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-java.h --- a/libinterp/octave-value/ov-java.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-java.h Thu Dec 01 14:28:07 2022 -0800 @@ -31,11 +31,11 @@ #include "ov.h" #include "ovl.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class type_info; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) typedef void *voidptr; diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-mex-fcn.h --- a/libinterp/octave-value/ov-mex-fcn.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-mex-fcn.h Thu Dec 01 14:28:07 2022 -0800 @@ -39,10 +39,11 @@ class octave_value; class octave_value_list; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class tree_evaluator; -} + +OCTAVE_END_NAMESPACE(octave) // Dynamically-linked functions. diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-null-mat.cc --- a/libinterp/octave-value/ov-null-mat.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-null-mat.cc Thu Dec 01 14:28:07 2022 -0800 @@ -96,7 +96,7 @@ octave_char_matrix_sq_str::static_type_id ()); } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (isnull, args, , doc: /* -*- texinfo -*- @@ -158,4 +158,4 @@ %! assert (isnull (x), false); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-oncleanup.cc --- a/libinterp/octave-value/ov-oncleanup.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-oncleanup.cc Thu Dec 01 14:28:07 2022 -0800 @@ -201,7 +201,7 @@ } } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (onCleanup, args, , doc: /* -*- texinfo -*- @@ -235,4 +235,4 @@ %! end_unwind_protect */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-struct.cc --- a/libinterp/octave-value/ov-struct.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-struct.cc Thu Dec 01 14:28:07 2022 -0800 @@ -1710,7 +1710,7 @@ return false; } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (struct, args, , doc: /* -*- texinfo -*- @@ -2253,4 +2253,4 @@ "print_struct_array_contents"); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-typeinfo.cc --- a/libinterp/octave-value/ov-typeinfo.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-typeinfo.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "ov-typeinfo.h" #include "ov.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) extern void install_ops (type_info& ti); @@ -763,10 +763,10 @@ return retval; } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) -namespace octave_value_typeinfo -{ +OCTAVE_BEGIN_NAMESPACE(octave_value_typeinfo) + int register_type (const std::string& t_name, const std::string& c_name, const octave_value& val) { @@ -887,9 +887,10 @@ return type_info.installed_type_info (); } -} -OCTAVE_NAMESPACE_BEGIN +OCTAVE_END_NAMESPACE(octave_value_typeinfo) + +OCTAVE_BEGIN_NAMESPACE(octave) DEFMETHOD (typeinfo, interp, args, , doc: /* -*- texinfo -*- @@ -1031,4 +1032,4 @@ return ovl (type_info.installed_type_info ()); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-typeinfo.h --- a/libinterp/octave-value/ov-typeinfo.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-typeinfo.h Thu Dec 01 14:28:07 2022 -0800 @@ -37,7 +37,7 @@ class string_vector; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class OCTINTERP_API @@ -268,10 +268,10 @@ Array m_widening_ops; }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) -namespace octave_value_typeinfo -{ +OCTAVE_BEGIN_NAMESPACE(octave_value_typeinfo) + typedef octave::type_info::unary_class_op_fcn unary_class_op_fcn; typedef octave::type_info::unary_op_fcn unary_op_fcn; @@ -331,6 +331,7 @@ extern OCTINTERP_API string_vector installed_type_names (void); extern OCTINTERP_API octave_scalar_map installed_type_info (void); -} + +OCTAVE_END_NAMESPACE(octave_value_typeinfo) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-usr-fcn.cc --- a/libinterp/octave-value/ov-usr-fcn.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-usr-fcn.cc Thu Dec 01 14:28:07 2022 -0800 @@ -646,7 +646,7 @@ } } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFMETHOD (nargin, interp, args, , doc: /* -*- texinfo -*- @@ -1031,4 +1031,4 @@ %! assert (b, {0, 1, {-1, -1}}); */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov-usr-fcn.h --- a/libinterp/octave-value/ov-usr-fcn.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov-usr-fcn.h Thu Dec 01 14:28:07 2022 -0800 @@ -41,8 +41,8 @@ class octave_value; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class file_info; class stack_frame; class tree_parameter_list; @@ -50,7 +50,8 @@ class tree_evaluator; class tree_expression; class tree_walker; -} + +OCTAVE_END_NAMESPACE(octave) class octave_user_code : public octave_function diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov.cc --- a/libinterp/octave-value/ov.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov.cc Thu Dec 01 14:28:07 2022 -0800 @@ -1272,7 +1272,7 @@ } } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (double, args, , doc: /* -*- texinfo -*- @@ -1535,7 +1535,7 @@ %!assert (uint64 (-2^65), uint64 (0)) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) octave_value octave_value::single_subsref (const std::string& type, @@ -2656,7 +2656,7 @@ return octave_value (rhs.empty_clone ()); } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) OCTAVE_NORETURN static void err_binary_op (const std::string& on, const std::string& tn1, @@ -3603,7 +3603,7 @@ return unary_op (ti, op, v); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) void install_types (octave::type_info& ti) @@ -3688,7 +3688,7 @@ octave_java::register_type (ti); } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (sizeof, args, , doc: /* -*- texinfo -*- @@ -4108,4 +4108,4 @@ %!assert (typeinfo (__test_dr__ (false)), "matrix") */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave-value/ov.h --- a/libinterp/octave-value/ov.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave-value/ov.h Thu Dec 01 14:28:07 2022 -0800 @@ -44,12 +44,12 @@ #include "oct-time.h" #include "str-vec.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class stack_frame; class type_info; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) class Cell; class float_format; @@ -1629,7 +1629,7 @@ // Non-member unary and binary operations on octave_value objects. -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) extern OCTINTERP_API octave_value unary_op (type_info& ti, octave_value::unary_op op, @@ -1679,7 +1679,7 @@ return colon_op (base, octave_value (), limit, is_for_cmd_expr); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #define OV_UNOP_FN(name) \ inline octave_value \ diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave.cc --- a/libinterp/octave.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave.cc Thu Dec 01 14:28:07 2022 -0800 @@ -54,7 +54,7 @@ #include "sysdep.h" #include "usage.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) cmdline_options::cmdline_options (void) { @@ -557,4 +557,4 @@ %!error program_name (1) */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/octave.h --- a/libinterp/octave.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/octave.h Thu Dec 01 14:28:07 2022 -0800 @@ -36,7 +36,7 @@ class octave_value; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Command line arguments. See also options.h. @@ -385,6 +385,6 @@ int execute (void); }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/mk-ops.sh --- a/libinterp/operators/mk-ops.sh Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/mk-ops.sh Thu Dec 01 14:28:07 2022 -0800 @@ -36,7 +36,7 @@ #include "ov-typeinfo.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) extern void install_base_type_conversions (octave::type_info&); @@ -64,7 +64,7 @@ cat << \EOF } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) EOF diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-b-b.cc --- a/libinterp/operators/op-b-b.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-b-b.cc Thu Dec 01 14:28:07 2022 -0800 @@ -54,7 +54,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // bool unary ops. @@ -145,4 +145,4 @@ INSTALL_ASSIGNCONV_TI (ti, octave_bool, octave_null_sq_str, octave_bool_matrix); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-b-bm.cc --- a/libinterp/operators/op-b-bm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-b-bm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -41,7 +41,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // bool matrix by bool ops. @@ -85,4 +85,4 @@ INSTALL_WIDENOP_TI (ti, octave_bool, octave_bool_matrix, bool_matrix_conv); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-b-sbm.cc --- a/libinterp/operators/op-b-sbm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-b-sbm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -39,7 +39,7 @@ #include "ov-re-sparse.h" #include "ov-bool-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // bool by sparse bool matrix ops. @@ -104,4 +104,4 @@ sparse_bool_matrix_conv); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-bm-b.cc --- a/libinterp/operators/op-bm-b.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-bm-b.cc Thu Dec 01 14:28:07 2022 -0800 @@ -50,7 +50,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // bool matrix by bool ops. @@ -124,4 +124,4 @@ conv_and_assign); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-bm-bm.cc --- a/libinterp/operators/op-bm-bm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-bm-bm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -51,7 +51,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // unary bool matrix ops. @@ -206,4 +206,4 @@ assign_or); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-bm-sbm.cc --- a/libinterp/operators/op-bm-sbm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-bm-sbm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -41,7 +41,7 @@ #include "smx-bm-sbm.h" #include "smx-sbm-bm.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // bool matrix by sparse bool matrix ops. @@ -112,4 +112,4 @@ sparse_bool_matrix_conv); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-cdm-cdm.cc --- a/libinterp/operators/op-cdm-cdm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-cdm-cdm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // matrix unary ops. @@ -124,4 +124,4 @@ complex_diag_matrix_to_complex_matrix); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-cell.cc --- a/libinterp/operators/op-cell.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-cell.cc Thu Dec 01 14:28:07 2022 -0800 @@ -37,7 +37,7 @@ #include "ov-null-mat.h" #include "ops.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // cell ops. @@ -74,4 +74,4 @@ null_assign); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-chm.cc --- a/libinterp/operators/op-chm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-chm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "ov-typeinfo.h" #include "ops.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // char matrix unary ops. @@ -113,4 +113,4 @@ INSTALL_CATOP_TI (ti, octave_matrix, octave_char_matrix, m_chm); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-class.cc --- a/libinterp/operators/op-class.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-class.cc Thu Dec 01 14:28:07 2022 -0800 @@ -43,7 +43,7 @@ #include "symtab.h" #include "parse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) //! Default unary class operator. //! @@ -224,4 +224,4 @@ ti.install_binary_class_op (octave_value::op_el_or, oct_binop_or); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-cm-cm.cc --- a/libinterp/operators/op-cm-cm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-cm-cm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // unary complex matrix ops. @@ -329,4 +329,4 @@ assign_el_div); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-cm-cs.cc --- a/libinterp/operators/op-cm-cs.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-cm-cs.cc Thu Dec 01 14:28:07 2022 -0800 @@ -37,7 +37,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // complex matrix by complex scalar ops. @@ -168,4 +168,4 @@ assign_div); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-cm-m.cc --- a/libinterp/operators/op-cm-m.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-cm-m.cc Thu Dec 01 14:28:07 2022 -0800 @@ -42,7 +42,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // complex matrix by matrix ops. @@ -157,4 +157,4 @@ assign); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-cm-s.cc --- a/libinterp/operators/op-cm-s.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-cm-s.cc Thu Dec 01 14:28:07 2022 -0800 @@ -40,7 +40,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // complex matrix by scalar ops. @@ -148,4 +148,4 @@ assign_div); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-cm-scm.cc --- a/libinterp/operators/op-cm-scm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-cm-scm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -40,7 +40,7 @@ #include "smx-cm-scm.h" #include "ov-cx-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // complex matrix by sparse complex matrix ops. @@ -208,4 +208,4 @@ sparse_complex_matrix_conv); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-cm-sm.cc --- a/libinterp/operators/op-cm-sm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-cm-sm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -40,7 +40,7 @@ #include "smx-cm-sm.h" #include "ov-re-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // complex matrix by sparse matrix ops. @@ -175,4 +175,4 @@ } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-cs-cm.cc --- a/libinterp/operators/op-cs-cm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-cs-cm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -36,7 +36,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // complex scalar by complex matrix ops. @@ -146,4 +146,4 @@ complex_matrix_conv); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-cs-cs.cc --- a/libinterp/operators/op-cs-cs.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-cs-cs.cc Thu Dec 01 14:28:07 2022 -0800 @@ -40,7 +40,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // unary complex scalar ops. @@ -181,4 +181,4 @@ octave_complex_matrix); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-cs-m.cc --- a/libinterp/operators/op-cs-m.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-cs-m.cc Thu Dec 01 14:28:07 2022 -0800 @@ -42,7 +42,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // complex scalar by matrix ops. @@ -127,4 +127,4 @@ octave_complex_matrix); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-cs-s.cc --- a/libinterp/operators/op-cs-s.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-cs-s.cc Thu Dec 01 14:28:07 2022 -0800 @@ -37,7 +37,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // complex scalar by scalar ops. @@ -136,4 +136,4 @@ octave_complex_matrix); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-cs-scm.cc --- a/libinterp/operators/op-cs-scm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-cs-scm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -39,7 +39,7 @@ #include "sparse-xdiv.h" #include "ov-cx-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // complex scalar by sparse complex matrix ops. @@ -169,4 +169,4 @@ sparse_complex_matrix_conv); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-cs-sm.cc --- a/libinterp/operators/op-cs-sm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-cs-sm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -41,7 +41,7 @@ #include "smx-cs-sm.h" #include "smx-sm-cs.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // complex by sparse matrix ops. @@ -152,4 +152,4 @@ sparse_matrix_conv); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-dm-dm.cc --- a/libinterp/operators/op-dm-dm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-dm-dm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // matrix unary ops. @@ -101,4 +101,4 @@ diag_matrix_to_matrix); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-dm-scm.cc --- a/libinterp/operators/op-dm-scm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-dm-scm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -48,7 +48,7 @@ #include "sparse-xdiv.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // diagonal matrix by sparse matrix ops @@ -588,4 +588,4 @@ octave_complex_diag_matrix, sub_scm_cdm); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-dm-sm.cc --- a/libinterp/operators/op-dm-sm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-dm-sm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -37,7 +37,7 @@ #include "sparse-xdiv.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // diagonal matrix by sparse matrix ops @@ -206,4 +206,4 @@ div_sm_dm); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-dm-template.cc --- a/libinterp/operators/op-dm-template.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-dm-template.cc Thu Dec 01 14:28:07 2022 -0800 @@ -39,7 +39,7 @@ # include "ov-null-mat.h" #endif -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // matrix by diag matrix ops. @@ -105,4 +105,4 @@ #endif } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-dms-template.cc --- a/libinterp/operators/op-dms-template.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-dms-template.cc Thu Dec 01 14:28:07 2022 -0800 @@ -42,7 +42,7 @@ # define MATRIXV MATRIX #endif -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFNDBINOP_OP (sdmmul, SCALAR, MATRIX, SCALARV, MATRIXV, *) DEFNDBINOP_OP (dmsmul, MATRIX, SCALAR, MATRIXV, SCALARV, *) @@ -89,4 +89,4 @@ INSTALL_BINOP_TI (ti, op_pow, OCTAVE_MATRIX, OCTAVE_SCALAR, dmspow); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-fcdm-fcdm.cc --- a/libinterp/operators/op-fcdm-fcdm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-fcdm-fcdm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // matrix unary ops. @@ -121,4 +121,4 @@ float_complex_diag_matrix_to_complex_diag_matrix); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-fcm-fcm.cc --- a/libinterp/operators/op-fcm-fcm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-fcm-fcm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // unary complex matrix ops. @@ -353,4 +353,4 @@ octave_float_complex_matrix, assign_el_div); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-fcm-fcs.cc --- a/libinterp/operators/op-fcm-fcs.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-fcm-fcs.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // complex matrix by complex scalar ops. @@ -204,4 +204,4 @@ octave_float_complex_scalar, assign_div); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-fcm-fm.cc --- a/libinterp/operators/op-fcm-fm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-fcm-fm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -44,7 +44,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // complex matrix by matrix ops. @@ -207,4 +207,4 @@ octave_float_matrix, dbl_assign); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-fcm-fs.cc --- a/libinterp/operators/op-fcm-fs.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-fcm-fs.cc Thu Dec 01 14:28:07 2022 -0800 @@ -41,7 +41,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // complex matrix by scalar ops. @@ -205,4 +205,4 @@ octave_float_scalar, assign_div); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-fcn.cc --- a/libinterp/operators/op-fcn.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-fcn.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "ov-typeinfo.h" #include "ops.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFBINOP (eq, fcn_handle, fcn_handle) { @@ -60,4 +60,4 @@ INSTALL_BINOP_TI (ti, op_ne, octave_fcn_handle, octave_fcn_handle, ne); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-fcs-fcm.cc --- a/libinterp/operators/op-fcs-fcm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-fcs-fcm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // complex scalar by complex matrix ops. @@ -192,4 +192,4 @@ float_complex_matrix_conv); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-fcs-fcs.cc --- a/libinterp/operators/op-fcs-fcs.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-fcs-fcs.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // unary complex scalar ops. @@ -200,4 +200,4 @@ octave_float_complex_matrix); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-fcs-fm.cc --- a/libinterp/operators/op-fcs-fm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-fcs-fm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -43,7 +43,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // complex scalar by matrix ops. @@ -156,4 +156,4 @@ octave_complex_matrix); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-fcs-fs.cc --- a/libinterp/operators/op-fcs-fs.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-fcs-fs.cc Thu Dec 01 14:28:07 2022 -0800 @@ -40,7 +40,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // complex scalar by scalar ops. @@ -159,4 +159,4 @@ octave_float_complex_matrix); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-fdm-fdm.cc --- a/libinterp/operators/op-fdm-fdm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-fdm-fdm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // matrix unary ops. @@ -118,4 +118,4 @@ float_diag_matrix_to_float_matrix); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-fm-fcm.cc --- a/libinterp/operators/op-fm-fcm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-fm-fcm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -44,7 +44,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // matrix by complex matrix ops. @@ -233,4 +233,4 @@ float_complex_matrix_conv); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-fm-fcs.cc --- a/libinterp/operators/op-fm-fcs.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-fm-fcs.cc Thu Dec 01 14:28:07 2022 -0800 @@ -45,7 +45,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // matrix by complex scalar ops. @@ -165,4 +165,4 @@ octave_complex_matrix); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-fm-fm.cc --- a/libinterp/operators/op-fm-fm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-fm-fm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // matrix unary ops. @@ -275,4 +275,4 @@ assign_el_div); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-fm-fs.cc --- a/libinterp/operators/op-fm-fs.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-fm-fs.cc Thu Dec 01 14:28:07 2022 -0800 @@ -37,7 +37,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // matrix by scalar ops. @@ -171,4 +171,4 @@ assign_div); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-fs-fcm.cc --- a/libinterp/operators/op-fs-fcm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-fs-fcm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -44,7 +44,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // scalar by complex matrix ops. @@ -189,4 +189,4 @@ float_complex_matrix_conv); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-fs-fcs.cc --- a/libinterp/operators/op-fs-fcs.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-fs-fcs.cc Thu Dec 01 14:28:07 2022 -0800 @@ -40,7 +40,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // scalar by complex scalar ops. @@ -158,4 +158,4 @@ octave_complex_matrix); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-fs-fm.cc --- a/libinterp/operators/op-fs-fm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-fs-fm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // scalar by matrix ops. @@ -157,4 +157,4 @@ INSTALL_WIDENOP_TI (ti, octave_float_scalar, octave_float_matrix, matrix_conv); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-fs-fs.cc --- a/libinterp/operators/op-fs-fs.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-fs-fs.cc Thu Dec 01 14:28:07 2022 -0800 @@ -40,7 +40,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // scalar unary ops. @@ -174,4 +174,4 @@ octave_float_matrix); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-i16-i16.cc --- a/libinterp/operators/op-i16-i16.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-i16-i16.cc Thu Dec 01 14:28:07 2022 -0800 @@ -96,7 +96,7 @@ #include "op-int.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) OCTAVE_INT_OPS (int16) @@ -162,4 +162,4 @@ OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int16, uint64); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-i32-i32.cc --- a/libinterp/operators/op-i32-i32.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-i32-i32.cc Thu Dec 01 14:28:07 2022 -0800 @@ -96,7 +96,7 @@ #include "op-int.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) OCTAVE_INT_OPS (int32) @@ -162,4 +162,4 @@ OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int32, uint64); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-i64-i64.cc --- a/libinterp/operators/op-i64-i64.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-i64-i64.cc Thu Dec 01 14:28:07 2022 -0800 @@ -96,7 +96,7 @@ #include "op-int.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) OCTAVE_INT_OPS (int64) @@ -162,4 +162,4 @@ OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int64, uint64); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-i8-i8.cc --- a/libinterp/operators/op-i8-i8.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-i8-i8.cc Thu Dec 01 14:28:07 2022 -0800 @@ -96,7 +96,7 @@ #include "op-int.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) OCTAVE_INT_OPS (int8) @@ -162,4 +162,4 @@ OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int8, uint64); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-int-concat.cc --- a/libinterp/operators/op-int-concat.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-int-concat.cc Thu Dec 01 14:28:07 2022 -0800 @@ -50,7 +50,7 @@ #include "op-int.h" #include "ops.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Concatenation of mixed integer types: @@ -322,4 +322,4 @@ OCTAVE_INSTALL_CHAR_INT_CONCAT_FN (uint64); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-m-cm.cc --- a/libinterp/operators/op-m-cm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-m-cm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -44,7 +44,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // matrix by complex matrix ops. @@ -187,4 +187,4 @@ complex_matrix_conv); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-m-cs.cc --- a/libinterp/operators/op-m-cs.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-m-cs.cc Thu Dec 01 14:28:07 2022 -0800 @@ -44,7 +44,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // matrix by complex scalar ops. @@ -139,4 +139,4 @@ octave_float_complex_matrix); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-m-m.cc --- a/libinterp/operators/op-m-m.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-m-m.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // matrix unary ops. @@ -226,4 +226,4 @@ assign_el_div); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-m-s.cc --- a/libinterp/operators/op-m-s.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-m-s.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // matrix by scalar ops. @@ -150,4 +150,4 @@ INSTALL_ASSIGNOP_TI (ti, op_div_eq, octave_matrix, octave_scalar, assign_div); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-m-scm.cc --- a/libinterp/operators/op-m-scm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-m-scm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -41,7 +41,7 @@ #include "smx-m-scm.h" #include "ov-cx-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // matrix by sparse complex matrix ops. @@ -177,4 +177,4 @@ sparse_complex_matrix_conv); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-m-sm.cc --- a/libinterp/operators/op-m-sm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-m-sm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -40,7 +40,7 @@ #include "smx-m-sm.h" #include "ov-re-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // matrix by sparse matrix ops. @@ -168,4 +168,4 @@ sparse_matrix_conv); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-mi.cc --- a/libinterp/operators/op-mi.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-mi.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "ov-typeinfo.h" #include "ov.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Magic integer unary ops. Only + and - are allowed so that // expressions like @@ -124,4 +124,4 @@ INSTALL_UNOP_TI (ti, op_uminus, octave_magic_int, signed_uminus); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-pm-pm.cc --- a/libinterp/operators/op-pm-pm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-pm-pm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -37,7 +37,7 @@ #include "ops.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUNOP (transpose, perm_matrix) { @@ -94,4 +94,4 @@ perm_matrix_to_matrix); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-pm-scm.cc --- a/libinterp/operators/op-pm-scm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-pm-scm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -36,7 +36,7 @@ #include "ov-perm.h" #include "ov-cx-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // permutation matrix by sparse matrix ops @@ -109,4 +109,4 @@ div_scm_pm); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-pm-sm.cc --- a/libinterp/operators/op-pm-sm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-pm-sm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -36,7 +36,7 @@ #include "ov-perm.h" #include "ov-re-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // permutation matrix by sparse matrix ops @@ -105,4 +105,4 @@ div_sm_pm); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-pm-template.cc --- a/libinterp/operators/op-pm-template.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-pm-template.cc Thu Dec 01 14:28:07 2022 -0800 @@ -42,7 +42,7 @@ # define LDMATRIX LMATRIX #endif -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) #define OCTAVE_LMATRIX CONCAT2(octave_, LMATRIX) #define OCTAVE_LDMATRIX CONCAT2(octave_, LDMATRIX) @@ -100,4 +100,4 @@ #endif } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-range.cc --- a/libinterp/operators/op-range.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-range.cc Thu Dec 01 14:28:07 2022 -0800 @@ -36,7 +36,7 @@ #include "ov-null-mat.h" #include "ops.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Allow +RNG_VAL to avoid conversion to array. DEFUNOP_OP (uplus, range, /* no-op */) @@ -66,4 +66,4 @@ INSTALL_WIDENOP_TI (ti, octave_range, octave_matrix, range_to_matrix); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-s-cm.cc --- a/libinterp/operators/op-s-cm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-s-cm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -44,7 +44,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // scalar by complex matrix ops. @@ -145,4 +145,4 @@ complex_matrix_conv); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-s-cs.cc --- a/libinterp/operators/op-s-cs.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-s-cs.cc Thu Dec 01 14:28:07 2022 -0800 @@ -39,7 +39,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // scalar by complex scalar ops. @@ -140,4 +140,4 @@ octave_float_complex_matrix); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-s-m.cc --- a/libinterp/operators/op-s-m.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-s-m.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // scalar by matrix ops. @@ -133,4 +133,4 @@ INSTALL_WIDENOP_TI (ti, octave_scalar, octave_matrix, matrix_conv); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-s-s.cc --- a/libinterp/operators/op-s-s.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-s-s.cc Thu Dec 01 14:28:07 2022 -0800 @@ -41,7 +41,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // scalar unary ops. @@ -161,4 +161,4 @@ INSTALL_ASSIGNCONV_TI (ti, octave_scalar, octave_null_sq_str, octave_matrix); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-s-scm.cc --- a/libinterp/operators/op-s-scm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-s-scm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -42,7 +42,7 @@ #include "ov-re-sparse.h" #include "ov-cx-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // scalar by sparse complex matrix ops. @@ -166,4 +166,4 @@ sparse_complex_matrix_conv); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-s-sm.cc --- a/libinterp/operators/op-s-sm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-s-sm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "sparse-xdiv.h" #include "ov-re-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // scalar by sparse matrix ops. @@ -146,4 +146,4 @@ sparse_matrix_conv); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-sbm-b.cc --- a/libinterp/operators/op-sbm-b.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-sbm-b.cc Thu Dec 01 14:28:07 2022 -0800 @@ -46,7 +46,7 @@ #include "ov-re-sparse.h" #include "ov-bool-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // sparse bool matrix by bool ops. @@ -157,4 +157,4 @@ conv_and_assign); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-sbm-bm.cc --- a/libinterp/operators/op-sbm-bm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-sbm-bm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -51,7 +51,7 @@ #include "smx-bm-sbm.h" #include "smx-sbm-bm.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // sparse bool matrix by bool matrix ops. @@ -184,4 +184,4 @@ null_assign); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-sbm-sbm.cc --- a/libinterp/operators/op-sbm-sbm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-sbm-sbm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "ov-re-sparse.h" #include "ov-bool-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // unary sparse bool matrix ops. @@ -110,4 +110,4 @@ octave_sparse_bool_matrix, assign); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-scm-cm.cc --- a/libinterp/operators/op-scm-cm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-scm-cm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -41,7 +41,7 @@ #include "smx-cm-scm.h" #include "ov-cx-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // sparse complex matrix by complex matrix ops. @@ -197,4 +197,4 @@ octave_float_complex_matrix, sgl_assign); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-scm-cs.cc --- a/libinterp/operators/op-scm-cs.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-scm-cs.cc Thu Dec 01 14:28:07 2022 -0800 @@ -40,7 +40,7 @@ #include "sparse-xdiv.h" #include "ov-cx-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // sparse complex matrix by complex scalar ops. @@ -173,4 +173,4 @@ octave_float_complex, sgl_assign); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-scm-m.cc --- a/libinterp/operators/op-scm-m.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-scm-m.cc Thu Dec 01 14:28:07 2022 -0800 @@ -42,7 +42,7 @@ #include "smx-m-scm.h" #include "ov-cx-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // sparse complex matrix by matrix ops. @@ -174,4 +174,4 @@ sgl_assign); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-scm-s.cc --- a/libinterp/operators/op-scm-s.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-scm-s.cc Thu Dec 01 14:28:07 2022 -0800 @@ -43,7 +43,7 @@ #include "ov-re-sparse.h" #include "ov-cx-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // sparse complex matrix by scalar ops. @@ -176,4 +176,4 @@ sgl_assign); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-scm-scm.cc --- a/libinterp/operators/op-scm-scm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-scm-scm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -42,7 +42,7 @@ #include "xdiv.h" #include "xpow.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // unary sparse complex matrix ops. @@ -213,4 +213,4 @@ octave_null_sq_str, null_assign); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-scm-sm.cc --- a/libinterp/operators/op-scm-sm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-scm-sm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -39,7 +39,7 @@ #include "ov-re-sparse.h" #include "ov-cx-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // sparse complex matrix by sparse matrix ops. @@ -176,4 +176,4 @@ octave_sparse_matrix, assign); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-sm-cm.cc --- a/libinterp/operators/op-sm-cm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-sm-cm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -41,7 +41,7 @@ #include "smx-cm-sm.h" #include "ov-re-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // sparse matrix by complex matrix ops. @@ -184,4 +184,4 @@ sparse_complex_matrix_conv); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-sm-cs.cc --- a/libinterp/operators/op-sm-cs.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-sm-cs.cc Thu Dec 01 14:28:07 2022 -0800 @@ -42,7 +42,7 @@ #include "smx-sm-cs.h" #include "smx-cs-sm.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // sparse matrix by scalar ops. @@ -156,4 +156,4 @@ octave_sparse_complex_matrix); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-sm-m.cc --- a/libinterp/operators/op-sm-m.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-sm-m.cc Thu Dec 01 14:28:07 2022 -0800 @@ -41,7 +41,7 @@ #include "smx-m-sm.h" #include "ov-re-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // sparse matrix by matrix ops. @@ -164,4 +164,4 @@ sgl_assign); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-sm-s.cc --- a/libinterp/operators/op-sm-s.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-sm-s.cc Thu Dec 01 14:28:07 2022 -0800 @@ -39,7 +39,7 @@ #include "sparse-xdiv.h" #include "ov-re-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // sparse matrix by scalar ops. @@ -158,4 +158,4 @@ sgl_assign); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-sm-scm.cc --- a/libinterp/operators/op-sm-scm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-sm-scm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -39,7 +39,7 @@ #include "ov-re-sparse.h" #include "ov-cx-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // sparse matrix by sparse complex matrix ops. @@ -185,4 +185,4 @@ sparse_complex_matrix_conv); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-sm-sm.cc --- a/libinterp/operators/op-sm-sm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-sm-sm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,7 +38,7 @@ #include "sparse-xdiv.h" #include "ov-re-sparse.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // sparse matrix unary ops. @@ -192,4 +192,4 @@ null_assign); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-str-m.cc --- a/libinterp/operators/op-str-m.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-str-m.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "ov-typeinfo.h" #include "ops.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFASSIGNOP (assign, char_matrix_str, octave_matrix) { @@ -70,4 +70,4 @@ INSTALL_CATOP_TI (ti, octave_matrix, octave_char_matrix_sq_str, m_str); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-str-s.cc --- a/libinterp/operators/op-str-s.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-str-s.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "ov-typeinfo.h" #include "ops.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFASSIGNOP (assign, char_matrix_str, octave_scalar) { @@ -70,4 +70,4 @@ INSTALL_CATOP_TI (ti, octave_scalar, octave_char_matrix_sq_str, s_str); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-str-str.cc --- a/libinterp/operators/op-str-str.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-str-str.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "ov-null-mat.h" #include "ops.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // string unary ops. @@ -220,4 +220,4 @@ } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-struct.cc --- a/libinterp/operators/op-struct.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-struct.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "ov-typeinfo.h" #include "ops.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // struct ops. @@ -113,4 +113,4 @@ INSTALL_CATOP_TI (ti, octave_matrix, octave_struct, matrix_struct); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-ui16-ui16.cc --- a/libinterp/operators/op-ui16-ui16.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-ui16-ui16.cc Thu Dec 01 14:28:07 2022 -0800 @@ -96,7 +96,7 @@ #include "op-int.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) OCTAVE_INT_OPS (uint16) @@ -162,4 +162,4 @@ OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint16, uint64); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-ui32-ui32.cc --- a/libinterp/operators/op-ui32-ui32.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-ui32-ui32.cc Thu Dec 01 14:28:07 2022 -0800 @@ -96,7 +96,7 @@ #include "op-int.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) OCTAVE_INT_OPS (uint32) @@ -161,4 +161,4 @@ OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint32, uint64); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-ui64-ui64.cc --- a/libinterp/operators/op-ui64-ui64.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-ui64-ui64.cc Thu Dec 01 14:28:07 2022 -0800 @@ -96,7 +96,7 @@ #include "op-int.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) OCTAVE_INT_OPS (uint64) @@ -162,4 +162,4 @@ OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint64, int64); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/op-ui8-ui8.cc --- a/libinterp/operators/op-ui8-ui8.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/op-ui8-ui8.cc Thu Dec 01 14:28:07 2022 -0800 @@ -96,7 +96,7 @@ #include "op-int.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) OCTAVE_INT_OPS (uint8) @@ -162,4 +162,4 @@ OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint8, uint64); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/operators/ops.h --- a/libinterp/operators/ops.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/operators/ops.h Thu Dec 01 14:28:07 2022 -0800 @@ -31,10 +31,11 @@ #include "Array-util.h" #include "error.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class type_info; -} + +OCTAVE_END_NAMESPACE(octave) // Concatenation macros that enforce argument prescan #define CONCAT2X(x, y) x ## y diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/anon-fcn-validator.cc --- a/libinterp/parse-tree/anon-fcn-validator.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/anon-fcn-validator.cc Thu Dec 01 14:28:07 2022 -0800 @@ -33,8 +33,8 @@ #include "ov.h" #include "pt-all.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + anon_fcn_validator::anon_fcn_validator (tree_parameter_list *, tree_expression *expr) : m_ok (true), m_line (-1), m_column (-1), m_message () @@ -80,4 +80,5 @@ m_message = "invalid use of operator " + expr.oper () + " in anonymous function"; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/anon-fcn-validator.h --- a/libinterp/parse-tree/anon-fcn-validator.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/anon-fcn-validator.h Thu Dec 01 14:28:07 2022 -0800 @@ -32,8 +32,8 @@ #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class tree_expression; class tree_parameter_list; @@ -77,6 +77,7 @@ void error (tree_expression& expr); }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/bp-table.cc --- a/libinterp/parse-tree/bp-table.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/bp-table.cc Thu Dec 01 14:28:07 2022 -0800 @@ -54,8 +54,8 @@ #include "pt-stmt.h" #include "sighandlers.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class bp_file_info { public: @@ -1147,4 +1147,5 @@ return retval; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/bp-table.h --- a/libinterp/parse-tree/bp-table.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/bp-table.h Thu Dec 01 14:28:07 2022 -0800 @@ -37,8 +37,8 @@ class octave_user_code; class octave_value_list; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class tree_evaluator; struct bp_type @@ -205,6 +205,7 @@ bp_lines remove_all_breakpoints_in_file_1 (octave_user_code *fcn, const std::string& fname); }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/comment-list.cc --- a/libinterp/parse-tree/comment-list.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/comment-list.cc Thu Dec 01 14:28:07 2022 -0800 @@ -32,8 +32,8 @@ #include "comment-list.h" #include "error.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + comment_list * comment_list::dup (void) const { @@ -44,4 +44,5 @@ return new_cl; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/comment-list.h --- a/libinterp/parse-tree/comment-list.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/comment-list.h Thu Dec 01 14:28:07 2022 -0800 @@ -32,8 +32,8 @@ #include "base-list.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + extern std::string get_comment_text (void); extern char * get_comment_text_c_str (void); @@ -109,6 +109,7 @@ comment_list * dup (void) const; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/filepos.h --- a/libinterp/parse-tree/filepos.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/filepos.h Thu Dec 01 14:28:07 2022 -0800 @@ -28,8 +28,8 @@ #include "octave-config.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class filepos { public: @@ -69,6 +69,7 @@ int m_line; int m_column; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/lex.h --- a/libinterp/parse-tree/lex.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/lex.h Thu Dec 01 14:28:07 2022 -0800 @@ -39,8 +39,8 @@ #include "symscope.h" #include "token.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class interpreter; // Is the given string a keyword? @@ -872,6 +872,7 @@ int fill_flex_buffer (char *buf, unsigned int max_size); }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/lex.ll --- a/libinterp/parse-tree/lex.ll Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/lex.ll Thu Dec 01 14:28:07 2022 -0800 @@ -316,7 +316,7 @@ return c == ' ' || c == '\t' || c == '\n' || c == '\r'; } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) bool iskeyword (const std::string& s) { @@ -335,7 +335,7 @@ || s == "methods" || s == "properties")); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) %} @@ -2048,7 +2048,7 @@ } } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) DEFUN (iskeyword, args, , doc: /* -*- texinfo -*- @@ -4106,4 +4106,4 @@ return status; } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/oct-lvalue.cc --- a/libinterp/parse-tree/oct-lvalue.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/oct-lvalue.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,8 +35,8 @@ #include "oct-lvalue.h" #include "ov.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + bool octave_lvalue::is_defined (void) const { return ! is_black_hole () && m_frame->is_defined (m_sym); @@ -246,4 +246,5 @@ return retval; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/oct-lvalue.h --- a/libinterp/parse-tree/oct-lvalue.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/oct-lvalue.h Thu Dec 01 14:28:07 2022 -0800 @@ -34,8 +34,8 @@ #include "stack-frame.h" #include "symrec.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class octave_lvalue { public: @@ -99,6 +99,7 @@ std::list m_idx; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/oct-parse.yy --- a/libinterp/parse-tree/oct-parse.yy Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/oct-parse.yy Thu Dec 01 14:28:07 2022 -0800 @@ -2406,7 +2406,7 @@ parser.bison_error (s); } -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class parse_exception : public std::runtime_error { @@ -6820,4 +6820,4 @@ return retval; } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/parse.h --- a/libinterp/parse-tree/parse.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/parse.h Thu Dec 01 14:28:07 2022 -0800 @@ -46,8 +46,8 @@ class octave_user_code; class octave_user_function; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class comment_list; class parse_exception; class tree; @@ -96,15 +96,16 @@ class tree_switch_case; class tree_switch_case_list; class tree_switch_command; -} + +OCTAVE_END_NAMESPACE(octave) #include "ovl.h" // Nonzero means print parser debugging info (-d). extern int octave_debug; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class base_parser { private: @@ -951,6 +952,7 @@ extern OCTINTERP_API void cleanup_statement_list (tree_statement_list **lst); -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/profiler.cc --- a/libinterp/parse-tree/profiler.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/profiler.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,7 +35,7 @@ #include "pager.h" #include "profiler.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) profiler::stats::stats (void) : m_time (0.0), m_calls (0), m_recursive (false), @@ -446,4 +446,4 @@ return ovl (profiler.get_flat ()); } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/profiler.h --- a/libinterp/parse-tree/profiler.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/profiler.h Thu Dec 01 14:28:07 2022 -0800 @@ -36,7 +36,7 @@ class octave_value; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class OCTINTERP_API @@ -220,6 +220,6 @@ void add_current_time (void); }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-anon-scopes.cc --- a/libinterp/parse-tree/pt-anon-scopes.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-anon-scopes.cc Thu Dec 01 14:28:07 2022 -0800 @@ -33,8 +33,8 @@ // TODO: make sure that if(f->scope()) is checked if necessary -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + tree_anon_scopes::tree_anon_scopes (tree_anon_fcn_handle& anon_fh) : tree_walker (), m_params (), m_vars () { @@ -120,5 +120,6 @@ elt->accept (*this); } } -} +OCTAVE_END_NAMESPACE(octave) + diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-anon-scopes.h --- a/libinterp/parse-tree/pt-anon-scopes.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-anon-scopes.h Thu Dec 01 14:28:07 2022 -0800 @@ -31,8 +31,8 @@ #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // In possibly nested definitions of anonymous functions, collect // their scopes and the symbol records therein. @@ -78,6 +78,7 @@ // Other variable names. std::set m_vars; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-arg-list.cc --- a/libinterp/parse-tree/pt-arg-list.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-arg-list.cc Thu Dec 01 14:28:07 2022 -0800 @@ -39,8 +39,8 @@ #include "pt-idx.h" #include "pt-pr-code.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Argument lists. tree_argument_list::~tree_argument_list (void) @@ -149,4 +149,5 @@ return new_list; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-arg-list.h --- a/libinterp/parse-tree/pt-arg-list.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-arg-list.h Thu Dec 01 14:28:07 2022 -0800 @@ -38,8 +38,8 @@ #include "base-list.h" #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class symbol_scope; class tree_evaluator; class tree_expression; @@ -114,6 +114,7 @@ bool m_simple_assign_lhs; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-args-block.cc --- a/libinterp/parse-tree/pt-args-block.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-args-block.cc Thu Dec 01 14:28:07 2022 -0800 @@ -29,8 +29,8 @@ #include "pt-args-block.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + tree_args_block_validation_list::~tree_args_block_validation_list (void) { while (! empty ()) @@ -40,4 +40,5 @@ erase (p); } } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-args-block.h --- a/libinterp/parse-tree/pt-args-block.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-args-block.h Thu Dec 01 14:28:07 2022 -0800 @@ -39,8 +39,8 @@ // FIXME: We could maybe re-think the naming of some of these objects // before releasing a version that contains these new classes... -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class tree_arg_size_spec { public: @@ -285,6 +285,7 @@ // Comment preceding ENDARGUMENTS token. comment_list *m_trail_comm; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-array-list.cc --- a/libinterp/parse-tree/pt-array-list.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-array-list.cc Thu Dec 01 14:28:07 2022 -0800 @@ -32,8 +32,8 @@ #include "error.h" #include "pt-array-list.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + tree_array_list::~tree_array_list (void) { while (! empty ()) @@ -86,4 +86,5 @@ { panic_impossible (); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-array-list.h --- a/libinterp/parse-tree/pt-array-list.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-array-list.h Thu Dec 01 14:28:07 2022 -0800 @@ -32,8 +32,8 @@ #include "pt-arg-list.h" #include "pt-exp.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class symbol_scope; class tree_walker; @@ -84,6 +84,7 @@ void accept (tree_walker& tw); }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-assign.cc --- a/libinterp/parse-tree/pt-assign.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-assign.cc Thu Dec 01 14:28:07 2022 -0800 @@ -36,8 +36,8 @@ #include "pt-arg-list.h" #include "pt-assign.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Simple assignment expressions. tree_simple_assignment::tree_simple_assignment (tree_expression *le, @@ -349,7 +349,8 @@ return val; } -} + +OCTAVE_END_NAMESPACE(octave) /* %!function varargout = f1 () diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-assign.h --- a/libinterp/parse-tree/pt-assign.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-assign.h Thu Dec 01 14:28:07 2022 -0800 @@ -38,8 +38,8 @@ #include "pt-exp.h" #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class symbol_scope; class octave_lvalue; class tree_argument_list; @@ -181,6 +181,7 @@ // True if we should not delete the lhs. bool m_preserve; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-binop.cc --- a/libinterp/parse-tree/pt-binop.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-binop.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,8 +35,8 @@ #include "pt-eval.h" #include "variables.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Binary expressions. void @@ -239,4 +239,5 @@ return val; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-binop.h --- a/libinterp/parse-tree/pt-binop.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-binop.h Thu Dec 01 14:28:07 2022 -0800 @@ -37,8 +37,8 @@ #include "pt-exp.h" #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class symbol_scope; // Binary expressions. @@ -207,6 +207,7 @@ // The type of the expression. type m_etype; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-bp.cc --- a/libinterp/parse-tree/pt-bp.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-bp.cc Thu Dec 01 14:28:07 2022 -0800 @@ -31,8 +31,8 @@ #include "pager.h" #include "pt-all.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + void tree_breakpoint::visit_while_command (tree_while_command& cmd) { @@ -477,4 +477,5 @@ else panic_impossible (); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-bp.h --- a/libinterp/parse-tree/pt-bp.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-bp.h Thu Dec 01 14:28:07 2022 -0800 @@ -34,8 +34,8 @@ #include "pt-pr-code.h" #include "interpreter.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class tree; class tree_decl_command; @@ -177,6 +177,7 @@ // List of breakpoint conditions. octave_value_list m_bp_cond_list; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-cbinop.cc --- a/libinterp/parse-tree/pt-cbinop.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-cbinop.cc Thu Dec 01 14:28:07 2022 -0800 @@ -33,8 +33,8 @@ #include "pt-eval.h" #include "pt-unop.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + octave_value tree_compound_binary_expression::evaluate (tree_evaluator& tw, int) { @@ -238,4 +238,5 @@ return ret; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-cbinop.h --- a/libinterp/parse-tree/pt-cbinop.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-cbinop.h Thu Dec 01 14:28:07 2022 -0800 @@ -37,8 +37,8 @@ #include "pt-binop.h" #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Binary expressions that can be reduced to compound operations class tree_compound_binary_expression : public tree_binary_expression @@ -95,6 +95,7 @@ int l = -1, int c = -1, octave_value::binary_op t = octave_value::unknown_binary_op); -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-cell.cc --- a/libinterp/parse-tree/pt-cell.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-cell.cc Thu Dec 01 14:28:07 2022 -0800 @@ -36,8 +36,8 @@ #include "pt-walk.h" #include "ov.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + tree_expression * tree_cell::dup (symbol_scope& scope) const { @@ -101,4 +101,5 @@ return octave_value (val); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-cell.h --- a/libinterp/parse-tree/pt-cell.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-cell.h Thu Dec 01 14:28:07 2022 -0800 @@ -36,8 +36,8 @@ #include "pt-mat.h" #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class symbol_scope; class tree_argument_list; @@ -77,6 +77,7 @@ tw.visit_cell (*this); } }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-check.cc --- a/libinterp/parse-tree/pt-check.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-check.cc Thu Dec 01 14:28:07 2022 -0800 @@ -32,8 +32,8 @@ #include "ov-usr-fcn.h" #include "pt-all.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + void tree_checker::visit_argument_list (tree_argument_list& lst) { @@ -177,4 +177,5 @@ else error ("%s: %d: %s", m_file_name.c_str (), line, msg.c_str ()); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-check.h --- a/libinterp/parse-tree/pt-check.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-check.h Thu Dec 01 14:28:07 2022 -0800 @@ -32,8 +32,8 @@ #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class tree_decl_command; // How to check the semantics of the code that the parse trees represent. @@ -73,6 +73,7 @@ OCTAVE_NORETURN void errmsg (const std::string& msg, int line); }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-classdef.cc --- a/libinterp/parse-tree/pt-classdef.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-classdef.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,8 +35,8 @@ #include "pt-classdef.h" #include "pt-eval.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + tree_superclass_ref * tree_superclass_ref::dup (symbol_scope&) const { @@ -316,4 +316,5 @@ return octave_value (); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-classdef.h --- a/libinterp/parse-tree/pt-classdef.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-classdef.h Thu Dec 01 14:28:07 2022 -0800 @@ -40,8 +40,8 @@ #include -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class interpreter; class tree_arg_validation; @@ -844,6 +844,7 @@ std::string m_pack_name; std::string m_file_name; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-cmd.h --- a/libinterp/parse-tree/pt-cmd.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-cmd.h Thu Dec 01 14:28:07 2022 -0800 @@ -35,8 +35,8 @@ #include "pt-bp.h" #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // A base class for commands. class tree_command : public tree @@ -125,6 +125,7 @@ tree_function_def (const octave_value& v, int l = -1, int c = -1) : tree_command (l, c), m_fcn (v) { } }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-colon.cc --- a/libinterp/parse-tree/pt-colon.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-colon.cc Thu Dec 01 14:28:07 2022 -0800 @@ -32,8 +32,8 @@ #include "pt-colon.h" #include "pt-eval.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Colon expressions. tree_expression * @@ -76,4 +76,5 @@ return colon_op (ov_base, ov_increment, ov_limit, is_for_cmd_expr ()); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-colon.h --- a/libinterp/parse-tree/pt-colon.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-colon.h Thu Dec 01 14:28:07 2022 -0800 @@ -36,8 +36,8 @@ #include "pt-exp.h" #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class symbol_scope; // Colon expressions. @@ -112,6 +112,7 @@ bool m_save_base; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-const.cc --- a/libinterp/parse-tree/pt-const.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-const.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,8 +35,8 @@ #include "pt-const.h" #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // We are likely to have a lot of tree_constant objects to allocate, // so make the grow_size large. @@ -70,4 +70,5 @@ return new_tc; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-const.h --- a/libinterp/parse-tree/pt-const.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-const.h Thu Dec 01 14:28:07 2022 -0800 @@ -39,8 +39,8 @@ #include "pt-exp.h" #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class symbol_scope; class tree_evaluator; @@ -120,6 +120,7 @@ // The original text form of this constant. std::string m_orig_text; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-decl.cc --- a/libinterp/parse-tree/pt-decl.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-decl.cc Thu Dec 01 14:28:07 2022 -0800 @@ -40,8 +40,8 @@ #include "utils.h" #include "variables.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Declarations (global, static, etc.). tree_decl_elt::tree_decl_elt (tree_identifier *i, tree_expression *e) @@ -88,4 +88,5 @@ { delete m_init_list; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-decl.h --- a/libinterp/parse-tree/pt-decl.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-decl.h Thu Dec 01 14:28:07 2022 -0800 @@ -37,8 +37,8 @@ #include "pt-id.h" #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class symbol_scope; class tree_evaluator; class tree_expression; @@ -215,6 +215,7 @@ // The list of variables or initializers in this declaration command. tree_decl_init_list *m_init_list; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-eval.cc --- a/libinterp/parse-tree/pt-eval.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-eval.cc Thu Dec 01 14:28:07 2022 -0800 @@ -73,7 +73,7 @@ #include "utils.h" #include "variables.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // Normal evaluator. @@ -5531,4 +5531,4 @@ %!error echo ("on", "all", "all") */ -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-eval.h --- a/libinterp/parse-tree/pt-eval.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-eval.h Thu Dec 01 14:28:07 2022 -0800 @@ -50,7 +50,7 @@ class octave_user_function; class octave_user_script; -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) class symbol_info_list; class symbol_scope; @@ -1002,6 +1002,6 @@ int m_num_indices; }; -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-except.cc --- a/libinterp/parse-tree/pt-except.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-except.cc Thu Dec 01 14:28:07 2022 -0800 @@ -43,8 +43,8 @@ #include "unwind-prot.h" #include "variables.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Simple exception handling. tree_try_catch_command::~tree_try_catch_command (void) @@ -67,4 +67,5 @@ delete m_mid_comm; delete m_trail_comm; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-except.h --- a/libinterp/parse-tree/pt-except.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-except.h Thu Dec 01 14:28:07 2022 -0800 @@ -32,8 +32,8 @@ #include "pt-id.h" #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class comment_list; class tree_statement_list; @@ -169,6 +169,7 @@ // Comment preceding END_UNWIND_PROTECT token. comment_list *m_trail_comm; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-exp.cc --- a/libinterp/parse-tree/pt-exp.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-exp.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,8 +35,8 @@ #include "ov.h" #include "pt-exp.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Expressions. octave_lvalue @@ -50,4 +50,5 @@ { return ""; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-exp.h --- a/libinterp/parse-tree/pt-exp.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-exp.h Thu Dec 01 14:28:07 2022 -0800 @@ -36,8 +36,8 @@ #include "pt.h" #include "pt-eval.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class symbol_scope; class octave_lvalue; @@ -163,6 +163,7 @@ // Print result of rvalue for this expression? bool m_print_flag; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-fcn-handle.cc --- a/libinterp/parse-tree/pt-fcn-handle.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-fcn-handle.cc Thu Dec 01 14:28:07 2022 -0800 @@ -34,8 +34,8 @@ #include "pt-fcn-handle.h" #include "stack-frame.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + void tree_fcn_handle::print (std::ostream& os, bool pr_as_read_syntax, bool pr_orig_text) @@ -103,7 +103,8 @@ { return tw.evaluate_anon_fcn_handle (*this); } -} + +OCTAVE_END_NAMESPACE(octave) /* %!function r = __f2 (f, x) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-fcn-handle.h --- a/libinterp/parse-tree/pt-fcn-handle.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-fcn-handle.h Thu Dec 01 14:28:07 2022 -0800 @@ -43,8 +43,8 @@ #include "ov.h" #include "ov-usr-fcn.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class tree_fcn_handle : public tree_expression { public: @@ -166,6 +166,7 @@ // Filename where the handle was defined. std::string m_file_name; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-id.cc --- a/libinterp/parse-tree/pt-id.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-id.cc Thu Dec 01 14:28:07 2022 -0800 @@ -37,8 +37,8 @@ #include "utils.h" #include "variables.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Symbols from the symbol table. void @@ -159,4 +159,5 @@ return retval; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-id.h --- a/libinterp/parse-tree/pt-id.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-id.h Thu Dec 01 14:28:07 2022 -0800 @@ -41,8 +41,8 @@ #include "pt-walk.h" #include "symscope.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class tree_evaluator; // Symbols from the symbol table. @@ -133,6 +133,7 @@ octave_lvalue lvalue (tree_evaluator& tw); }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-idx.cc --- a/libinterp/parse-tree/pt-idx.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-idx.cc Thu Dec 01 14:28:07 2022 -0800 @@ -42,8 +42,8 @@ #include "variables.h" #include "errwarn.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Index expressions. tree_index_expression::tree_index_expression (int l, int c) @@ -697,7 +697,8 @@ return retval; } -} + +OCTAVE_END_NAMESPACE(octave) /* %!test diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-idx.h --- a/libinterp/parse-tree/pt-idx.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-idx.h Thu Dec 01 14:28:07 2022 -0800 @@ -39,8 +39,8 @@ #include "pt-exp.h" #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class octave_lvalue; class symbol_scope; class tree_argument_list; @@ -147,6 +147,7 @@ octave_map make_arg_struct (void) const; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-jump.h --- a/libinterp/parse-tree/pt-jump.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-jump.h Thu Dec 01 14:28:07 2022 -0800 @@ -31,8 +31,8 @@ #include "pt-cmd.h" #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Break. class tree_break_command : public tree_command @@ -101,6 +101,7 @@ tw.visit_return_command (*this); } }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-loop.cc --- a/libinterp/parse-tree/pt-loop.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-loop.cc Thu Dec 01 14:28:07 2022 -0800 @@ -32,8 +32,8 @@ #include "pt-loop.h" #include "pt-stmt.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // While. tree_while_command::~tree_while_command (void) @@ -64,4 +64,5 @@ delete m_lead_comm; delete m_trail_comm; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-loop.h --- a/libinterp/parse-tree/pt-loop.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-loop.h Thu Dec 01 14:28:07 2022 -0800 @@ -33,8 +33,8 @@ #include "pt-cmd.h" #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class tree_argument_list; class tree_expression; class tree_statement_list; @@ -274,6 +274,7 @@ // Comment preceding ENDFOR token. comment_list *m_trail_comm; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-mat.cc --- a/libinterp/parse-tree/pt-mat.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-mat.cc Thu Dec 01 14:28:07 2022 -0800 @@ -42,8 +42,8 @@ #include "ov-re-sparse.h" #include "ov-cx-sparse.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + octave_value tree_matrix::evaluate (tree_evaluator& tw, int) { @@ -140,4 +140,5 @@ return new_matrix; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-mat.h --- a/libinterp/parse-tree/pt-mat.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-mat.h Thu Dec 01 14:28:07 2022 -0800 @@ -38,8 +38,8 @@ #include "pt-exp.h" #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class symbol_scope; class tree_argument_list; @@ -86,6 +86,7 @@ extern void maybe_warn_string_concat (bool all_dq_strings_p, bool all_sq_strings_p); -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-misc.cc --- a/libinterp/parse-tree/pt-misc.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-misc.cc Thu Dec 01 14:28:07 2022 -0800 @@ -30,8 +30,8 @@ #include "pt-idx.h" #include "pt-misc.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Parameter lists. tree_parameter_list::~tree_parameter_list (void) @@ -77,4 +77,5 @@ return new_list; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-misc.h --- a/libinterp/parse-tree/pt-misc.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-misc.h Thu Dec 01 14:28:07 2022 -0800 @@ -32,8 +32,8 @@ #include "pt-decl.h" #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class symbol_scope; class tree_identifier; class tree_index_expression; @@ -113,6 +113,7 @@ // 0: does not take varargs. int m_marked_for_varargs; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-pr-code.cc --- a/libinterp/parse-tree/pt-pr-code.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-pr-code.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,8 +35,8 @@ #include "pr-output.h" #include "pt-all.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + void tree_print_code::visit_anon_fcn_handle (tree_anon_fcn_handle& afh) { @@ -1341,4 +1341,5 @@ decrement_indent_level (); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-pr-code.h --- a/libinterp/parse-tree/pt-pr-code.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-pr-code.h Thu Dec 01 14:28:07 2022 -0800 @@ -33,8 +33,8 @@ #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class comment_elt; class comment_list; class tree_decl_command; @@ -209,6 +209,7 @@ tree_print_code (void); }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-select.cc --- a/libinterp/parse-tree/pt-select.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-select.cc Thu Dec 01 14:28:07 2022 -0800 @@ -31,8 +31,8 @@ #include "pt-select.h" #include "pt-stmt.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // If clauses. tree_if_clause::~tree_if_clause (void) @@ -69,4 +69,5 @@ delete m_lead_comm; delete m_trail_comm; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-select.h --- a/libinterp/parse-tree/pt-select.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-select.h Thu Dec 01 14:28:07 2022 -0800 @@ -33,8 +33,8 @@ #include "pt-cmd.h" #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class tree_expression; class tree_statement_list; @@ -296,6 +296,7 @@ // Comment preceding ENDSWITCH token. comment_list *m_trail_comm; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-spmd.cc --- a/libinterp/parse-tree/pt-spmd.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-spmd.cc Thu Dec 01 14:28:07 2022 -0800 @@ -31,12 +31,13 @@ #include "pt-spmd.h" #include "pt-stmt.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + tree_spmd_command::~tree_spmd_command (void) { delete m_body; delete m_lead_comm; delete m_trail_comm; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-spmd.h --- a/libinterp/parse-tree/pt-spmd.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-spmd.h Thu Dec 01 14:28:07 2022 -0800 @@ -32,8 +32,8 @@ #include "pt-cmd.h" #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class tree_comment_list; class tree_statement_list; @@ -78,6 +78,7 @@ // Comment preceding ENDSPMD token. comment_list *m_trail_comm; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-stmt.cc --- a/libinterp/parse-tree/pt-stmt.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-stmt.cc Thu Dec 01 14:28:07 2022 -0800 @@ -49,8 +49,8 @@ #include "utils.h" #include "variables.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // A list of commands to be executed. tree_statement::~tree_statement (void) @@ -297,4 +297,5 @@ return retval; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-stmt.h --- a/libinterp/parse-tree/pt-stmt.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-stmt.h Thu Dec 01 14:28:07 2022 -0800 @@ -39,8 +39,8 @@ class event_manager; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class comment_list; class tree_command; class tree_evaluator; @@ -212,6 +212,7 @@ // Does this list of statements make up the body of a script? bool m_script_body; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-tm-const.cc --- a/libinterp/parse-tree/pt-tm-const.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-tm-const.cc Thu Dec 01 14:28:07 2022 -0800 @@ -58,8 +58,8 @@ error ("%s (%s vs %s)", msg, x.str ().c_str (), y.str ().c_str ()); } -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + void tm_row_const::cellify (void) { bool elt_changed = false; @@ -702,7 +702,8 @@ return octave_map::cat (-1, nrows, map_row_list); } -} + +OCTAVE_END_NAMESPACE(octave) /* ## test concatenation with all zero matrices diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-tm-const.h --- a/libinterp/parse-tree/pt-tm-const.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-tm-const.h Thu Dec 01 14:28:07 2022 -0800 @@ -43,8 +43,8 @@ #include "pt-arg-list.h" #include "pt-mat.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class tree_evaluator; // Evaluate tree_matrix objects and convert them to octave_value @@ -239,6 +239,7 @@ template octave_map map_concat (void) const; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-unop.cc --- a/libinterp/parse-tree/pt-unop.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-unop.cc Thu Dec 01 14:28:07 2022 -0800 @@ -32,8 +32,8 @@ #include "profiler.h" #include "pt-unop.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Unary expressions. std::string @@ -156,4 +156,5 @@ return val; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-unop.h --- a/libinterp/parse-tree/pt-unop.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-unop.h Thu Dec 01 14:28:07 2022 -0800 @@ -37,8 +37,8 @@ #include "pt-exp.h" #include "pt-walk.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class symbol_scope; // Unary expressions. @@ -165,6 +165,7 @@ std::string profiler_name (void) const { return "postfix " + oper (); } }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-vm-eval.cc --- a/libinterp/parse-tree/pt-vm-eval.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-vm-eval.cc Thu Dec 01 14:28:07 2022 -0800 @@ -30,7 +30,7 @@ #include "defun.h" #include "variables.h" -OCTAVE_NAMESPACE_BEGIN +OCTAVE_BEGIN_NAMESPACE(octave) // If TRUE, use VM evaluator rather than tree walker. @@ -69,4 +69,4 @@ #endif } -OCTAVE_NAMESPACE_END +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-walk.cc --- a/libinterp/parse-tree/pt-walk.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-walk.cc Thu Dec 01 14:28:07 2022 -0800 @@ -29,8 +29,8 @@ #include "pt-all.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + void tree_walker::visit_anon_fcn_handle (tree_anon_fcn_handle& afh) { tree_parameter_list *parameter_list = afh.parameter_list (); @@ -785,4 +785,5 @@ if (body) body->accept (*this); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt-walk.h --- a/libinterp/parse-tree/pt-walk.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt-walk.h Thu Dec 01 14:28:07 2022 -0800 @@ -31,8 +31,8 @@ class octave_user_script; class octave_user_function; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // No separate visitor needed // Base classes only, so no need to include them. // @@ -257,6 +257,7 @@ virtual void visit_classdef (tree_classdef&); }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt.cc --- a/libinterp/parse-tree/pt.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt.cc Thu Dec 01 14:28:07 2022 -0800 @@ -37,8 +37,8 @@ #include "pt-pr-code.h" #include "unwind-prot.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Hide the details of the string buffer so that we are less likely to // create a memory leak. @@ -106,4 +106,5 @@ return retval; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/pt.h --- a/libinterp/parse-tree/pt.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/pt.h Thu Dec 01 14:28:07 2022 -0800 @@ -34,8 +34,8 @@ class octave_function; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class tree_evaluator; class tree_walker; @@ -122,6 +122,7 @@ // NULL if no breakpoint, or a breakpoint condition if there is one. std::string *m_bp_cond; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/token.cc --- a/libinterp/parse-tree/token.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/token.cc Thu Dec 01 14:28:07 2022 -0800 @@ -32,8 +32,8 @@ #include "error.h" #include "token.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + token::token (int tv, const filepos& beg_pos, const filepos& end_pos) : m_maybe_cmd (false), m_tspc (false), m_beg_pos (beg_pos), m_end_pos (end_pos), m_tok_val (tv), m_type_tag (generic_token), @@ -139,4 +139,5 @@ { return m_orig_text; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 libinterp/parse-tree/token.h --- a/libinterp/parse-tree/token.h Thu Dec 01 14:01:16 2022 -0800 +++ b/libinterp/parse-tree/token.h Thu Dec 01 14:28:07 2022 -0800 @@ -33,8 +33,8 @@ #include "filepos.h" #include "ov.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class token { public: @@ -207,6 +207,7 @@ std::string m_orig_text; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/array/Range.cc --- a/liboctave/array/Range.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/array/Range.cc Thu Dec 01 14:28:07 2022 -0800 @@ -39,8 +39,8 @@ #include "lo-mappers.h" #include "lo-utils.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + template T xtfloor (T x, T ct) { @@ -451,4 +451,5 @@ { return xnnz (m_base, m_limit, m_increment, m_final, m_numel); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/array/Range.h --- a/liboctave/array/Range.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/array/Range.h Thu Dec 01 14:28:07 2022 -0800 @@ -38,8 +38,8 @@ #include "oct-sort.h" #include "range-fwd.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // For now, only define for floating point types. However, we only // need range as a temporary local variable in make_float_range // in ov.cc. @@ -393,6 +393,7 @@ template <> OCTAVE_API octave_idx_type range::nnz (void) const; template <> OCTAVE_API octave_idx_type range::nnz (void) const; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/array/idx-vector.cc --- a/liboctave/array/idx-vector.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/array/idx-vector.cc Thu Dec 01 14:28:07 2022 -0800 @@ -42,8 +42,8 @@ #include "lo-error.h" #include "lo-mappers.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + OCTAVE_NORETURN static void err_invalid_range (void) { (*current_liboctave_error_handler) ("invalid range used as index"); @@ -1275,7 +1275,8 @@ INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint16) INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint32) INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint64) -} + +OCTAVE_END_NAMESPACE(octave) /* diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/array/idx-vector.h --- a/liboctave/array/idx-vector.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/array/idx-vector.h Thu Dec 01 14:28:07 2022 -0800 @@ -42,8 +42,8 @@ #include "Sparse-fwd.h" #include "range-fwd.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Design rationale: // // idx_vector is a reference-counting, polymorphic pointer, that can @@ -1030,7 +1030,8 @@ idx_base_rep *m_rep; }; -} + +OCTAVE_END_NAMESPACE(octave) // Provide the following typedef for backward compatibility. Don't // deprecate (yet) because it is used extensively. diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/array/range-fwd.h --- a/liboctave/array/range-fwd.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/array/range-fwd.h Thu Dec 01 14:28:07 2022 -0800 @@ -28,9 +28,10 @@ #include "octave-config.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + template class OCTAVE_API range; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/CollocWt.cc --- a/liboctave/numeric/CollocWt.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/CollocWt.cc Thu Dec 01 14:28:07 2022 -0800 @@ -45,8 +45,8 @@ // // Translated to C++ by jwe. -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Compute the first three derivatives of the node polynomial. // // n0 (alpha,beta) n1 @@ -501,4 +501,5 @@ return os; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/CollocWt.h --- a/liboctave/numeric/CollocWt.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/CollocWt.h Thu Dec 01 14:28:07 2022 -0800 @@ -33,8 +33,8 @@ #include "dMatrix.h" #include "dColVector.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class OCTAVE_API CollocWt { public: @@ -206,6 +206,7 @@ void error (const char *msg); }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/aepbalance.cc --- a/liboctave/numeric/aepbalance.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/aepbalance.cc Thu Dec 01 14:28:07 2022 -0800 @@ -37,16 +37,16 @@ #include "lo-error.h" #include "lo-lapack-proto.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + static inline char get_job (bool noperm, bool noscal) { return noperm ? (noscal ? 'N' : 'S') : (noscal ? 'P' : 'B'); } - namespace math - { +OCTAVE_BEGIN_NAMESPACE(math) + template <> OCTAVE_API aepbalance::aepbalance (const Matrix& a, bool noperm, bool noscal) @@ -267,5 +267,6 @@ template class aepbalance; template class aepbalance; - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/aepbalance.h --- a/liboctave/numeric/aepbalance.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/aepbalance.h Thu Dec 01 14:28:07 2022 -0800 @@ -30,10 +30,10 @@ #include -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + template class aepbalance @@ -124,7 +124,8 @@ octave_idx_type m_ihi; char m_job; }; - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/chol.cc --- a/liboctave/numeric/chol.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/chol.cc Thu Dec 01 14:28:07 2022 -0800 @@ -47,8 +47,8 @@ # include "qr.h" #endif -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + static Matrix chol2inv_internal (const Matrix& r, bool is_upper = true) { @@ -235,8 +235,8 @@ return retval; } - namespace math - { +OCTAVE_BEGIN_NAMESPACE(math) + template T chol2inv (const T& r) @@ -1154,5 +1154,6 @@ template OCTAVE_API FloatComplexMatrix chol2inv (const FloatComplexMatrix& r); - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/chol.h --- a/liboctave/numeric/chol.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/chol.h Thu Dec 01 14:28:07 2022 -0800 @@ -28,10 +28,10 @@ #include "octave-config.h" -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + template class chol @@ -104,7 +104,8 @@ template OCTAVE_API T chol2inv (const T& r); - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/gepbalance.cc --- a/liboctave/numeric/gepbalance.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/gepbalance.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,10 +38,10 @@ #include "oct-locbuf.h" #include "quit.h" -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + template <> OCTAVE_API octave_idx_type gepbalance::init (const Matrix& a, const Matrix& b, @@ -321,5 +321,6 @@ template class gepbalance; template class gepbalance; - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/gepbalance.h --- a/liboctave/numeric/gepbalance.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/gepbalance.h Thu Dec 01 14:28:07 2022 -0800 @@ -30,10 +30,10 @@ #include -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + template class gepbalance @@ -94,7 +94,8 @@ OCTAVE_API octave_idx_type init (const T& a, const T& b, const std::string& job); }; - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/gsvd.cc --- a/liboctave/numeric/gsvd.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/gsvd.cc Thu Dec 01 14:28:07 2022 -0800 @@ -42,8 +42,8 @@ #include "oct-locbuf.h" #include "oct-shlib.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + static std::unordered_map gsvd_fcn; static bool have_DGGSVD3 = false; @@ -230,8 +230,8 @@ typedef comp_ggsvd_ptr::type cggsvd_type; typedef comp_ggsvd3_ptr::type cggsvd3_type; - namespace math - { +OCTAVE_BEGIN_NAMESPACE(math) + template <> void gsvd::ggsvd (char& jobu, char& jobv, char& jobq, F77_INT m, @@ -693,5 +693,6 @@ template class gsvd; template class gsvd; template class gsvd; - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/gsvd.h --- a/liboctave/numeric/gsvd.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/gsvd.h Thu Dec 01 14:28:07 2022 -0800 @@ -28,10 +28,10 @@ #include "octave-config.h" -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + template class OCTAVE_API @@ -110,7 +110,8 @@ T m_left_smA, m_left_smB; T m_right_sm; }; - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/hess.cc --- a/liboctave/numeric/hess.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/hess.cc Thu Dec 01 14:28:07 2022 -0800 @@ -36,10 +36,10 @@ #include "lo-error.h" #include "lo-lapack-proto.h" -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + template <> OCTAVE_API octave_idx_type hess::init (const Matrix& a) @@ -294,5 +294,6 @@ return info; } - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/hess.h --- a/liboctave/numeric/hess.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/hess.h Thu Dec 01 14:28:07 2022 -0800 @@ -30,10 +30,10 @@ #include -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + template class hess @@ -88,7 +88,8 @@ template extern OCTAVE_API std::ostream& operator << (std::ostream& os, const hess& a); - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/lo-mappers.cc --- a/liboctave/numeric/lo-mappers.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/lo-mappers.cc Thu Dec 01 14:28:07 2022 -0800 @@ -39,10 +39,10 @@ // but now we just use std:: and explicit wrappers in C++ code so maybe // some of the forwarding functions can be defined inline here. -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + bool isna (double x) { @@ -338,5 +338,6 @@ return x < 0.0f ? FloatComplex (0.0f, std::sqrt (-x)) : FloatComplex (std::sqrt (x)); } - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/lo-mappers.h --- a/liboctave/numeric/lo-mappers.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/lo-mappers.h Thu Dec 01 14:28:07 2022 -0800 @@ -36,10 +36,10 @@ #include "oct-cmplx.h" #include "oct-inttypes-fwd.h" -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + extern OCTAVE_API bool isna (double x); extern OCTAVE_API bool isna (float x); extern OCTAVE_API bool isna (const Complex& x); @@ -461,7 +461,8 @@ extern OCTAVE_API Complex rc_sqrt (double); extern OCTAVE_API FloatComplex rc_sqrt (float); - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/lo-specfun.cc --- a/liboctave/numeric/lo-specfun.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/lo-specfun.cc Thu Dec 01 14:28:07 2022 -0800 @@ -55,10 +55,10 @@ #include "lo-specfun.h" #include "mx-inlines.cc" -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + static inline Complex bessel_return_value (const Complex& val, octave_idx_type ierr) { @@ -2206,5 +2206,6 @@ ? FloatComplex (std::log (-(1.0f + x)), M_PI) : FloatComplex (log1p (x))); } - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/lo-specfun.h --- a/liboctave/numeric/lo-specfun.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/lo-specfun.h Thu Dec 01 14:28:07 2022 -0800 @@ -33,10 +33,10 @@ #include "Array.h" #include "oct-cmplx.h" -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + inline double acosh (double x) { return std::acosh (x); } inline float acosh (float x) { return std::acoshf (x); } inline Complex acosh (const Complex& x) { return std::acosh (x); } @@ -353,7 +353,8 @@ extern OCTAVE_API Complex rc_log1p (double x); extern OCTAVE_API FloatComplex rc_log1p (float x); - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/lu.cc --- a/liboctave/numeric/lu.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/lu.cc Thu Dec 01 14:28:07 2022 -0800 @@ -44,10 +44,10 @@ #include "lu.h" #include "oct-locbuf.h" -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + // FIXME: PermMatrix::col_perm_vec returns Array // but m_ipvt is an Array. This could cause // trouble for large arrays if octave_f77_int_type is 32-bits but @@ -920,5 +920,6 @@ template class lu; template class lu; - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/lu.h --- a/liboctave/numeric/lu.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/lu.h Thu Dec 01 14:28:07 2022 -0800 @@ -32,10 +32,10 @@ #include "Array.h" -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + template class lu @@ -106,7 +106,8 @@ // so we need a Fortran INTEGER. Array m_ipvt; }; - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/oct-convn.cc --- a/liboctave/numeric/oct-convn.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/oct-convn.cc Thu Dec 01 14:28:07 2022 -0800 @@ -50,8 +50,8 @@ #include "fRowVector.h" #include "oct-convn.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // 2d convolution with a matrix kernel. template static void @@ -222,4 +222,5 @@ CONV_DEFS (Float, Float) CONV_DEFS (FloatComplex, Float) CONV_DEFS (FloatComplex, FloatComplex) -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/oct-convn.h --- a/liboctave/numeric/oct-convn.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/oct-convn.h Thu Dec 01 14:28:07 2022 -0800 @@ -55,8 +55,8 @@ convn_valid }; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + enum convn_type { convn_full, @@ -155,6 +155,7 @@ abort (); } } -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/oct-fftw.cc --- a/liboctave/numeric/oct-fftw.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/oct-fftw.cc Thu Dec 01 14:28:07 2022 -0800 @@ -41,8 +41,8 @@ # include "nproc-wrapper.h" #endif -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + #if defined (HAVE_FFTW) fftw_planner *fftw_planner::s_instance = nullptr; @@ -1153,4 +1153,5 @@ return "none"; #endif } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/oct-fftw.h --- a/liboctave/numeric/oct-fftw.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/oct-fftw.h Thu Dec 01 14:28:07 2022 -0800 @@ -35,8 +35,8 @@ #include "dim-vector.h" #include "oct-cmplx.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class OCTAVE_API fftw_planner @@ -380,6 +380,7 @@ extern OCTAVE_API std::string fftw_version (void); extern OCTAVE_API std::string fftwf_version (void); -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/oct-norm.cc --- a/liboctave/numeric/oct-norm.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/oct-norm.cc Thu Dec 01 14:28:07 2022 -0800 @@ -63,8 +63,8 @@ #include "quit.h" #include "svd.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Theory: norm accumulator is an object that has an accum method able // to handle both real and complex element, and a cast operator // returning the intermediate norm. Reference: Higham, N. "Estimating @@ -624,4 +624,5 @@ DEFINE_COLROW_NORM_FCNS(Sparse, , double) DEFINE_COLROW_NORM_FCNS(SparseComplex, , double) -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/oct-norm.h --- a/liboctave/numeric/oct-norm.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/oct-norm.h Thu Dec 01 14:28:07 2022 -0800 @@ -32,8 +32,8 @@ #include "oct-cmplx.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + extern OCTAVE_API double xnorm (const ColumnVector&, double p = 2); extern OCTAVE_API double xnorm (const RowVector&, double p = 2); extern OCTAVE_API double xnorm (const Matrix&, double p = 2); @@ -77,6 +77,7 @@ extern OCTAVE_API RowVector xcolnorms (const SparseComplexMatrix&, double p = 2); extern OCTAVE_API ColumnVector xrownorms (const SparseComplexMatrix&, double p = 2); -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/oct-rand.cc --- a/liboctave/numeric/oct-rand.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/oct-rand.cc Thu Dec 01 14:28:07 2022 -0800 @@ -46,8 +46,8 @@ #include "randpoisson.h" #include "singleton-cleanup.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + rand *rand::m_instance = nullptr; rand::rand (void) @@ -790,4 +790,5 @@ return; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/oct-rand.h --- a/liboctave/numeric/oct-rand.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/oct-rand.h Thu Dec 01 14:28:07 2022 -0800 @@ -39,8 +39,8 @@ //class dim_vector; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class OCTAVE_API rand { protected: @@ -291,6 +291,7 @@ OCTAVE_API void fill (octave_idx_type len, float *v, float a); }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/oct-spparms.cc --- a/liboctave/numeric/oct-spparms.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/oct-spparms.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,8 +35,8 @@ #include "oct-spparms.h" #include "singleton-cleanup.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + sparse_params *sparse_params::s_instance = nullptr; bool sparse_params::instance_ok (void) @@ -202,4 +202,5 @@ for (int i = 0; i < OCTAVE_SPARSE_CONTROLS_SIZE; i++) os << prefix << m_keys(i) << ": " << m_params(i) << "\n"; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/oct-spparms.h --- a/liboctave/numeric/oct-spparms.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/oct-spparms.h Thu Dec 01 14:28:07 2022 -0800 @@ -37,8 +37,8 @@ #define OCTAVE_SPARSE_CONTROLS_SIZE 13 -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class OCTAVE_API sparse_params { protected: @@ -113,6 +113,7 @@ void init_keys (void); }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/qr.cc --- a/liboctave/numeric/qr.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/qr.cc Thu Dec 01 14:28:07 2022 -0800 @@ -50,10 +50,10 @@ #include "oct-sort.h" #include "qr.h" -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + template qr::qr (const T& q_arg, const T& r_arg) : m_q (q_arg), m_r (r_arg) @@ -2102,5 +2102,6 @@ template class qr; template class qr; - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/qr.h --- a/liboctave/numeric/qr.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/qr.h Thu Dec 01 14:28:07 2022 -0800 @@ -30,10 +30,10 @@ #include "Array-fwd.h" -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + template class qr @@ -114,7 +114,8 @@ }; extern OCTAVE_API void warn_qrupdate_once (void); - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/qrp.cc --- a/liboctave/numeric/qrp.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/qrp.cc Thu Dec 01 14:28:07 2022 -0800 @@ -43,10 +43,10 @@ #include "oct-locbuf.h" #include "qrp.h" -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + // Specialization. template <> @@ -348,5 +348,6 @@ FloatRowVector pv (MArray (pa) + 1.0f); return pv; } - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/qrp.h --- a/liboctave/numeric/qrp.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/qrp.h Thu Dec 01 14:28:07 2022 -0800 @@ -31,10 +31,10 @@ #include "PermMatrix.h" #include "qr.h" -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + template class qrp : public qr @@ -74,7 +74,8 @@ PermMatrix m_p; }; - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/randgamma.cc --- a/liboctave/numeric/randgamma.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/randgamma.cc Thu Dec 01 14:28:07 2022 -0800 @@ -90,8 +90,8 @@ #include "randgamma.h" #include "randmtzig.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + template void rand_gamma (T a, octave_idx_type n, T *r) { octave_idx_type i; @@ -133,4 +133,5 @@ template OCTAVE_API void rand_gamma (double, octave_idx_type, double *); template OCTAVE_API void rand_gamma (float, octave_idx_type, float *); -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/randgamma.h --- a/liboctave/numeric/randgamma.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/randgamma.h Thu Dec 01 14:28:07 2022 -0800 @@ -31,8 +31,8 @@ #include "octave-config.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + template OCTAVE_API void rand_gamma (T a, octave_idx_type n, T *p); @@ -45,6 +45,7 @@ rand_gamma (a, 1, &retval); return retval; } -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/randmtzig.cc --- a/liboctave/numeric/randmtzig.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/randmtzig.cc Thu Dec 01 14:28:07 2022 -0800 @@ -178,8 +178,8 @@ # endif #endif -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + /* ===== Mersenne Twister 32-bit generator ===== */ #define MT_M 397 @@ -864,5 +864,6 @@ { std::generate_n (p, n, [](void) { return rand_exponential (); }); } -} +OCTAVE_END_NAMESPACE(octave) + diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/randmtzig.h --- a/liboctave/numeric/randmtzig.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/randmtzig.h Thu Dec 01 14:28:07 2022 -0800 @@ -71,8 +71,8 @@ #define MT_N 624 -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Mersenne Twister. extern OCTAVE_API void init_mersenne_twister (void); @@ -117,6 +117,7 @@ template <> OCTAVE_API void rand_exponential (octave_idx_type n, float *p); -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/randpoisson.cc --- a/liboctave/numeric/randpoisson.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/randpoisson.cc Thu Dec 01 14:28:07 2022 -0800 @@ -39,8 +39,8 @@ #include "randmtzig.h" #include "randpoisson.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + static double xlgamma (double x) { return std::lgamma (x); @@ -457,4 +457,5 @@ template OCTAVE_API double rand_poisson (double); template OCTAVE_API float rand_poisson (float); -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/randpoisson.h --- a/liboctave/numeric/randpoisson.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/randpoisson.h Thu Dec 01 14:28:07 2022 -0800 @@ -31,11 +31,12 @@ #include "octave-config.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + template OCTAVE_API void rand_poisson (T L, octave_idx_type n, T *p); template OCTAVE_API T rand_poisson (T L); -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/schur.cc --- a/liboctave/numeric/schur.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/schur.cc Thu Dec 01 14:28:07 2022 -0800 @@ -37,10 +37,10 @@ #include "oct-locbuf.h" #include "schur.h" -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + // For real types. static F77_INT @@ -506,5 +506,6 @@ template class schur; template class schur; - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/schur.h --- a/liboctave/numeric/schur.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/schur.h Thu Dec 01 14:28:07 2022 -0800 @@ -37,10 +37,10 @@ #include "fCMatrix.h" #include "fMatrix.h" -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + template class schur @@ -104,7 +104,8 @@ template extern OCTAVE_API schur rsf2csf (const AT& s, const AT& u); - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/sparse-chol.cc --- a/liboctave/numeric/sparse-chol.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/sparse-chol.cc Thu Dec 01 14:28:07 2022 -0800 @@ -41,10 +41,10 @@ #include "sparse-chol.h" #include "sparse-util.h" -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + template class sparse_chol::sparse_chol_rep { @@ -568,5 +568,5 @@ template OCTAVE_API SparseComplexMatrix chol2inv (const SparseComplexMatrix& r); - } -} +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/sparse-chol.h --- a/liboctave/numeric/sparse-chol.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/sparse-chol.h Thu Dec 01 14:28:07 2022 -0800 @@ -34,10 +34,10 @@ #include "CSparse.h" -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + // If the sparse matrix classes become templated on the element type // (i.e., sparse_matrix), then it might be best to make the // template parameter of this class also be the element type instead @@ -99,7 +99,8 @@ OCTAVE_API chol_type chol2inv (const chol_type& r); - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/sparse-lu.cc --- a/liboctave/numeric/sparse-lu.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/sparse-lu.cc Thu Dec 01 14:28:07 2022 -0800 @@ -37,10 +37,10 @@ #include "oct-spparms.h" #include "sparse-lu.h" -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + // Wrappers for SuiteSparse (formerly UMFPACK) functions that have // different names depending on the sparse matrix data type. // @@ -984,5 +984,6 @@ template class OCTAVE_API sparse_lu; template class OCTAVE_API sparse_lu; - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/sparse-lu.h --- a/liboctave/numeric/sparse-lu.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/sparse-lu.h Thu Dec 01 14:28:07 2022 -0800 @@ -34,10 +34,10 @@ #include "dMatrix.h" #include "dSparse.h" -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + // If the sparse matrix classes become templated on the element type // (i.e., sparse_matrix), then it might be best to make the // template parameter of this class also be the element type instead @@ -123,7 +123,8 @@ MArray m_P; MArray m_Q; }; - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/sparse-qr.cc --- a/liboctave/numeric/sparse-qr.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/sparse-qr.cc Thu Dec 01 14:28:07 2022 -0800 @@ -39,10 +39,10 @@ #include "quit.h" #include "sparse-qr.h" -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + #if defined (HAVE_CXSPARSE) template class @@ -3349,5 +3349,6 @@ SparseComplexMatrix> (a, b, info); } - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/sparse-qr.h --- a/liboctave/numeric/sparse-qr.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/sparse-qr.h Thu Dec 01 14:28:07 2022 -0800 @@ -34,10 +34,10 @@ #include "MArray-fwd.h" #include "mx-fwd.h" -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + // If the sparse matrix classes become templated on the element type // (i.e., sparse_matrix), then it might be best to make the // template parameter of this class also be the element type instead @@ -153,7 +153,8 @@ typedef sparse_qr SparseQR; typedef sparse_qr SparseComplexQR; - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/svd.cc --- a/liboctave/numeric/svd.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/svd.cc Thu Dec 01 14:28:07 2022 -0800 @@ -301,10 +301,10 @@ return lwork; } -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + template T svd::left_singular_matrix (void) const @@ -866,5 +866,6 @@ template class svd; template class svd; - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/numeric/svd.h --- a/liboctave/numeric/svd.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/numeric/svd.h Thu Dec 01 14:28:07 2022 -0800 @@ -30,10 +30,10 @@ #include -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + template class OCTAVE_API @@ -123,7 +123,8 @@ std::vector& iwork, octave_f77_int_type& info); }; - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/child-list.cc --- a/liboctave/system/child-list.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/child-list.cc Thu Dec 01 14:28:07 2022 -0800 @@ -30,8 +30,8 @@ #include "child-list.h" #include "oct-syscalls.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + void child_list::remove (pid_t pid) { m_list.remove_if ([pid] (const child& oc) { return oc.m_pid == pid; }); @@ -97,4 +97,5 @@ return retval; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/child-list.h --- a/liboctave/system/child-list.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/child-list.h Thu Dec 01 14:28:07 2022 -0800 @@ -34,8 +34,8 @@ #include "base-list.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class OCTAVE_API child { public: @@ -90,6 +90,7 @@ base_list m_list; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/dir-ops.cc --- a/liboctave/system/dir-ops.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/dir-ops.cc Thu Dec 01 14:28:07 2022 -0800 @@ -42,10 +42,10 @@ #include "lo-sysdep.h" #include "str-vec.h" -namespace octave -{ - namespace sys - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(sys) + bool dir_entry::open (const std::string& n) { @@ -109,5 +109,6 @@ { return octave_name_max_wrapper (); } - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/dir-ops.h --- a/liboctave/system/dir-ops.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/dir-ops.h Thu Dec 01 14:28:07 2022 -0800 @@ -32,10 +32,10 @@ #include "str-vec.h" -namespace octave -{ - namespace sys - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(sys) + class OCTAVE_API dir_entry @@ -105,7 +105,8 @@ // If a failure occurs, this contains the system error text. std::string m_errmsg; }; - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/file-ops.cc --- a/liboctave/system/file-ops.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/file-ops.cc Thu Dec 01 14:28:07 2022 -0800 @@ -57,8 +57,8 @@ #include "str-vec.h" #include "unistd-wrappers.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // The following tilde-expansion code was stolen and adapted from // readline. @@ -215,10 +215,10 @@ return dirname; } - namespace sys - { - namespace file_ops - { +OCTAVE_BEGIN_NAMESPACE(sys) + +OCTAVE_BEGIN_NAMESPACE(file_ops) + char dev_sep_char (void) { #if (defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM) && ! defined (OCTAVE_HAVE_POSIX_FILESYSTEM)) @@ -396,7 +396,8 @@ return retval; } - } + +OCTAVE_END_NAMESPACE(file_ops) int mkdir (const std::string& nm, mode_t md) { @@ -866,5 +867,6 @@ return retval; } - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/file-ops.h --- a/liboctave/system/file-ops.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/file-ops.h Thu Dec 01 14:28:07 2022 -0800 @@ -34,12 +34,12 @@ #include "str-vec.h" -namespace octave -{ - namespace sys - { - namespace file_ops - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(sys) + +OCTAVE_BEGIN_NAMESPACE(file_ops) + typedef std::string (*tilde_expansion_hook) (const std::string&); // If non-null, this contains the address of a function that the @@ -113,7 +113,8 @@ extern OCTAVE_API std::string native_separator_path (const std::string& path); - } + +OCTAVE_END_NAMESPACE(file_ops) extern OCTAVE_API int mkdir (const std::string&, mode_t); @@ -189,7 +190,8 @@ extern OCTAVE_API std::string canonicalize_file_name (const std::string&, std::string&); - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/file-stat.cc --- a/liboctave/system/file-stat.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/file-stat.cc Thu Dec 01 14:28:07 2022 -0800 @@ -41,10 +41,10 @@ # include "oct-env.h" #endif -namespace octave -{ - namespace sys - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(sys) + // FIXME: the is_* and mode_as_string functions are only valid // for initialized objects. If called for an object that is not // initialized, they should throw an exception. @@ -275,5 +275,6 @@ m_initialized = true; } } - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/file-stat.h --- a/liboctave/system/file-stat.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/file-stat.h Thu Dec 01 14:28:07 2022 -0800 @@ -34,10 +34,10 @@ #include -namespace octave -{ - namespace sys - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(sys) + class OCTAVE_API base_file_stat @@ -322,7 +322,8 @@ void update_internal (bool force = false); }; - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/lo-sysdep.cc --- a/liboctave/system/lo-sysdep.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/lo-sysdep.cc Thu Dec 01 14:28:07 2022 -0800 @@ -51,10 +51,10 @@ # include "unwind-prot.h" #endif -namespace octave -{ - namespace sys - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(sys) + int system (const std::string& cmd_str) { @@ -746,5 +746,6 @@ return orig_file_name; } - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/lo-sysdep.h --- a/liboctave/system/lo-sysdep.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/lo-sysdep.h Thu Dec 01 14:28:07 2022 -0800 @@ -37,10 +37,10 @@ class string_vector; -namespace octave -{ - namespace sys - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(sys) + extern OCTAVE_API int system (const std::string& cmd_str); extern OCTAVE_API std::string getcwd (void); @@ -83,7 +83,8 @@ extern OCTAVE_API std::string get_ASCII_filename (const std::string& long_file_name, const bool allow_locale = false); - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/lo-sysinfo.cc --- a/liboctave/system/lo-sysinfo.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/lo-sysinfo.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,10 +38,10 @@ #define xSTRINGIZE(x) #x #define STRINGIZE(x) xSTRINGIZE(x) -namespace octave -{ - namespace sys - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(sys) + std::string blas_version (void) { dynamic_library dyn_libs (""); @@ -191,5 +191,6 @@ return retval; } - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/lo-sysinfo.h --- a/liboctave/system/lo-sysinfo.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/lo-sysinfo.h Thu Dec 01 14:28:07 2022 -0800 @@ -30,14 +30,15 @@ #include -namespace octave -{ - namespace sys - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(sys) + extern OCTAVE_API std::string blas_version (void); extern OCTAVE_API std::string lapack_version (void); - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/mach-info.cc --- a/liboctave/system/mach-info.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/mach-info.cc Thu Dec 01 14:28:07 2022 -0800 @@ -38,10 +38,10 @@ int octave_is_big_endian (void); } -namespace octave -{ - namespace mach_info - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(mach_info) + static float_format get_float_format (void) { switch (octave_get_float_format ()) @@ -122,5 +122,6 @@ return retval; } - } -} + +OCTAVE_END_NAMESPACE(mach_info) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/mach-info.h --- a/liboctave/system/mach-info.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/mach-info.h Thu Dec 01 14:28:07 2022 -0800 @@ -30,10 +30,10 @@ #include -namespace octave -{ - namespace mach_info - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(mach_info) + enum float_format { // If these values change, you must also change the values @@ -53,7 +53,8 @@ OCTAVE_API float_format string_to_float_format (const std::string&); OCTAVE_API std::string float_format_as_string (float_format); - } -} + +OCTAVE_END_NAMESPACE(mach_info) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/oct-env.cc --- a/liboctave/system/oct-env.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/oct-env.cc Thu Dec 01 14:28:07 2022 -0800 @@ -65,10 +65,10 @@ # include #endif -namespace octave -{ - namespace sys - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(sys) + env::env (void) : m_follow_symbolic_links (true), m_verbatim_pwd (true), m_current_directory (), m_prog_name (), m_prog_invocation_name (), @@ -674,5 +674,6 @@ { (*current_liboctave_error_handler) ("%s", s.c_str ()); } - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/oct-env.h --- a/liboctave/system/oct-env.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/oct-env.h Thu Dec 01 14:28:07 2022 -0800 @@ -30,10 +30,10 @@ #include -namespace octave -{ - namespace sys - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(sys) + class OCTAVE_API env @@ -159,7 +159,8 @@ std::string m_host_name; }; - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/oct-group.cc --- a/liboctave/system/oct-group.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/oct-group.cc Thu Dec 01 14:28:07 2022 -0800 @@ -47,10 +47,10 @@ (*current_liboctave_error_handler) ("invalid group object"); } -namespace octave -{ - namespace sys - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(sys) + std::string group::name (void) const { @@ -233,5 +233,6 @@ msg = NOT_SUPPORTED ("group functions"); #endif } - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/oct-group.h --- a/liboctave/system/oct-group.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/oct-group.h Thu Dec 01 14:28:07 2022 -0800 @@ -34,10 +34,10 @@ #include "str-vec.h" -namespace octave -{ - namespace sys - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(sys) + class OCTAVE_API group @@ -115,7 +115,8 @@ // to a struct group. group (void *p, std::string& msg); }; - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/oct-password.cc --- a/liboctave/system/oct-password.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/oct-password.cc Thu Dec 01 14:28:07 2022 -0800 @@ -46,10 +46,10 @@ (*current_liboctave_error_handler) ("invalid password object"); } -namespace octave -{ - namespace sys - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(sys) + std::string password::name (void) const { @@ -241,5 +241,6 @@ msg = NOT_SUPPORTED ("password functions"); #endif } - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/oct-password.h --- a/liboctave/system/oct-password.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/oct-password.h Thu Dec 01 14:28:07 2022 -0800 @@ -32,10 +32,10 @@ #include -namespace octave -{ - namespace sys - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(sys) + class OCTAVE_API password @@ -135,7 +135,8 @@ // to a struct passwd. password (void *p, std::string& msg); }; - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/oct-syscalls.cc --- a/liboctave/system/oct-syscalls.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/oct-syscalls.cc Thu Dec 01 14:28:07 2022 -0800 @@ -44,10 +44,10 @@ #define NOT_SUPPORTED(nm) \ nm ": not supported on this system" -namespace octave -{ - namespace sys - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(sys) + int dup2 (int old_fd, int new_fd) { @@ -365,5 +365,6 @@ return status; } - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/oct-syscalls.h --- a/liboctave/system/oct-syscalls.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/oct-syscalls.h Thu Dec 01 14:28:07 2022 -0800 @@ -34,10 +34,10 @@ #include -namespace octave -{ - namespace sys - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(sys) + extern OCTAVE_API int dup2 (int, int); extern OCTAVE_API int dup2 (int, int, std::string&); @@ -103,7 +103,8 @@ extern OCTAVE_API int fcntl (int, int, long); extern OCTAVE_API int fcntl (int, int, long, std::string&); - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/oct-time.cc --- a/liboctave/system/oct-time.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/oct-time.cc Thu Dec 01 14:28:07 2022 -0800 @@ -48,10 +48,10 @@ #include "strptime-wrapper.h" #include "time-wrappers.h" -namespace octave -{ - namespace sys - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(sys) + time::time (double d) : m_ot_unix_time (static_cast (d)), m_ot_usec (0) { @@ -369,5 +369,6 @@ m_cpu = cpu_time (usr_sec, sys_sec, usr_usec, sys_usec); } - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/oct-time.h --- a/liboctave/system/oct-time.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/oct-time.h Thu Dec 01 14:28:07 2022 -0800 @@ -41,10 +41,10 @@ return (static_cast (sec) + static_cast (usec) / 1.0e6); } -namespace octave -{ - namespace sys - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(sys) + class base_tm; class @@ -528,7 +528,8 @@ long m_nvcsw; long m_nivcsw; }; - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/oct-uname.cc --- a/liboctave/system/oct-uname.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/oct-uname.cc Thu Dec 01 14:28:07 2022 -0800 @@ -33,10 +33,10 @@ #include "oct-uname.h" #include "uname-wrapper.h" -namespace octave -{ - namespace sys - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(sys) + void uname::init (void) { @@ -57,5 +57,6 @@ m_errmsg = ""; } } - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/system/oct-uname.h --- a/liboctave/system/oct-uname.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/system/oct-uname.h Thu Dec 01 14:28:07 2022 -0800 @@ -30,10 +30,10 @@ #include -namespace octave -{ - namespace sys - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(sys) + class OCTAVE_API uname @@ -95,7 +95,8 @@ void init (void); }; - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/action-container.cc --- a/liboctave/util/action-container.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/action-container.cc Thu Dec 01 14:28:07 2022 -0800 @@ -30,8 +30,8 @@ #include "action-container.h" #include "cmd-edit.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + void action_container::run (std::size_t num) { if (num > size ()) @@ -52,4 +52,5 @@ } } } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/action-container.h --- a/liboctave/util/action-container.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/action-container.h Thu Dec 01 14:28:07 2022 -0800 @@ -37,8 +37,8 @@ // FIXME: is there a better name for this class? -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class action_container { @@ -222,6 +222,7 @@ virtual void add_action (elem *new_elem) = 0; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/base-list.h --- a/liboctave/util/base-list.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/base-list.h Thu Dec 01 14:28:07 2022 -0800 @@ -32,8 +32,8 @@ #include -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + template class base_list @@ -105,6 +105,7 @@ std::list m_lst; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/cmd-edit.cc --- a/liboctave/util/cmd-edit.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/cmd-edit.cc Thu Dec 01 14:28:07 2022 -0800 @@ -52,8 +52,8 @@ #include "oct-rl-edit.h" #endif -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + char * do_completer_word_break_hook (); command_editor *command_editor::s_instance = nullptr; @@ -1965,4 +1965,5 @@ { (*current_liboctave_error_handler) ("%s", s.c_str ()); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/cmd-edit.h --- a/liboctave/util/cmd-edit.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/cmd-edit.h Thu Dec 01 14:28:07 2022 -0800 @@ -35,8 +35,8 @@ #include "str-vec.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class OCTAVE_API command_editor @@ -400,6 +400,7 @@ std::string m_initial_input; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/cmd-hist.cc --- a/liboctave/util/cmd-hist.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/cmd-hist.cc Thu Dec 01 14:28:07 2022 -0800 @@ -50,8 +50,8 @@ #include "file-stat.h" #endif -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + command_history *command_history::s_instance = nullptr; #if defined (USE_READLINE) @@ -1017,4 +1017,5 @@ { (*current_liboctave_error_handler) ("%s", s.c_str ()); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/cmd-hist.h --- a/liboctave/util/cmd-hist.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/cmd-hist.h Thu Dec 01 14:28:07 2022 -0800 @@ -32,8 +32,8 @@ #include "str-vec.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class OCTAVE_API command_history @@ -240,6 +240,7 @@ // The number of lines of history to save. int m_size; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/f77-fcn.h --- a/liboctave/util/f77-fcn.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/f77-fcn.h Thu Dec 01 14:28:07 2022 -0800 @@ -336,8 +336,8 @@ #if defined (__cplusplus) -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + inline F77_INT to_f77_int (octave_idx_type x) { @@ -348,7 +348,8 @@ return static_cast (x); } -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/file-info.cc --- a/liboctave/util/file-info.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/file-info.cc Thu Dec 01 14:28:07 2022 -0800 @@ -35,8 +35,8 @@ #include "lo-error.h" #include "lo-sysdep.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + std::string file_info::get_line (std::size_t line) const { std::string retval; @@ -139,4 +139,5 @@ return retval; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/file-info.h --- a/liboctave/util/file-info.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/file-info.h Thu Dec 01 14:28:07 2022 -0800 @@ -35,8 +35,8 @@ #include "oct-time.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class file_info { public: @@ -93,6 +93,7 @@ static OCTAVE_API std::vector get_line_offsets (const std::string& buf); }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/lo-array-errwarn.cc --- a/liboctave/util/lo-array-errwarn.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/lo-array-errwarn.cc Thu Dec 01 14:28:07 2022 -0800 @@ -36,8 +36,8 @@ #include "lo-array-errwarn.h" #include "lo-error.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Text constants used to shorten code below. static const char *error_id_nonconformant_args @@ -301,6 +301,7 @@ "matrix singular to machine precision, rcond = %g", rcond); } } -} + +OCTAVE_END_NAMESPACE(octave) /* Tests in test/index.tst */ diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/lo-array-errwarn.h --- a/liboctave/util/lo-array-errwarn.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/lo-array-errwarn.h Thu Dec 01 14:28:07 2022 -0800 @@ -31,8 +31,8 @@ #include "dim-vector.h" #include "quit.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Exception thrown by err_invalid_index // This is thrown when the invalid index is detected, at which point nd and dim // are usually not known. It is caught at the place they are known, where a @@ -155,6 +155,7 @@ extern OCTAVE_API void warn_singular_matrix (double rcond = 0.0); -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/lo-hash.cc --- a/liboctave/util/lo-hash.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/lo-hash.cc Thu Dec 01 14:28:07 2022 -0800 @@ -37,10 +37,10 @@ #include "lo-hash.h" #include "oct-locbuf.h" -namespace octave -{ - namespace crypto - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(crypto) + std::string hash (hash_fptr hash_fcn, const std::string& str, int result_buf_len) { @@ -141,5 +141,6 @@ (*current_liboctave_error_handler) ("hash function '%s' not supported", hash_type.c_str ()); } - } -} + +OCTAVE_END_NAMESPACE(crypto) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/lo-hash.h --- a/liboctave/util/lo-hash.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/lo-hash.h Thu Dec 01 14:28:07 2022 -0800 @@ -30,10 +30,10 @@ #include -namespace octave -{ - namespace crypto - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(crypto) + typedef void * (hash_fptr) (const char *buffer, std::size_t len, void *res); OCTAVE_API std::string @@ -59,7 +59,8 @@ OCTAVE_API std::string hash (const std::string& hash_type, const std::string& str); - } -} + +OCTAVE_END_NAMESPACE(crypto) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/lo-ieee.h --- a/liboctave/util/lo-ieee.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/lo-ieee.h Thu Dec 01 14:28:07 2022 -0800 @@ -123,8 +123,8 @@ #if defined (__cplusplus) -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + template struct numeric_limits { @@ -151,7 +151,8 @@ static float NaN (void) { return octave_Float_NaN; } static float Inf (void) { return octave_Float_Inf; } }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/lo-regexp.cc --- a/liboctave/util/lo-regexp.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/lo-regexp.cc Thu Dec 01 14:28:07 2022 -0800 @@ -97,8 +97,8 @@ #endif } -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Define the maximum number of retries for a pattern // that possibly results in an infinite recursion. #define PCRE_MATCHLIMIT_MAX 10 @@ -776,4 +776,5 @@ retval = rep; return retval; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/lo-regexp.h --- a/liboctave/util/lo-regexp.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/lo-regexp.h Thu Dec 01 14:28:07 2022 -0800 @@ -37,8 +37,8 @@ #include "base-list.h" #include "str-vec.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class OCTAVE_API regexp @@ -240,6 +240,7 @@ void compile_internal (void); }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/lo-utils.cc --- a/liboctave/util/lo-utils.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/lo-utils.cc Thu Dec 01 14:28:07 2022 -0800 @@ -45,8 +45,8 @@ #include "lo-utils.h" #include "oct-inttypes.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + bool is_int_or_inf_or_nan (double x) { return math::isnan (x) || math::x_nint (x) == x; @@ -481,8 +481,8 @@ os << ')'; } - namespace math - { +OCTAVE_BEGIN_NAMESPACE(math) + bool int_multiply_overflow (int a, int b, int *r) { return octave_i_multiply_overflow_wrapper (a, b, r); @@ -522,5 +522,5 @@ } #endif - } -} +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/lo-utils.h --- a/liboctave/util/lo-utils.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/lo-utils.h Thu Dec 01 14:28:07 2022 -0800 @@ -36,8 +36,8 @@ #include "oct-cmplx.h" #include "quit.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Generic any/all test functionality with arbitrary predicate. template @@ -109,8 +109,8 @@ template <> OCTAVE_API void write_value (std::ostream& os, const float& value); template <> OCTAVE_API void write_value (std::ostream& os, const FloatComplex& value); - namespace math - { +OCTAVE_BEGIN_NAMESPACE(math) + extern OCTAVE_API bool int_multiply_overflow (int a, int b, int *r); extern OCTAVE_API bool @@ -133,7 +133,8 @@ int_multiply_overflow (unsigned long long int a, unsigned long long int b, unsigned long long int *r); #endif - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/oct-base64.cc --- a/liboctave/util/oct-base64.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/oct-base64.cc Thu Dec 01 14:28:07 2022 -0800 @@ -33,8 +33,8 @@ #include "base64-wrappers.h" #include "oct-base64.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + bool base64_encode (const char *inc, const std::size_t inlen, char **out) { @@ -121,4 +121,5 @@ return retval; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/oct-base64.h --- a/liboctave/util/oct-base64.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/oct-base64.h Thu Dec 01 14:28:07 2022 -0800 @@ -33,8 +33,8 @@ #include "Array-fwd.h" #include "intNDArray.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + extern OCTAVE_API bool base64_encode (const char *inc, const std::size_t inlen, char **out); @@ -43,6 +43,7 @@ extern OCTAVE_API intNDArray base64_decode_bytes (const std::string& str); -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/oct-glob.cc --- a/liboctave/util/oct-glob.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/oct-glob.cc Thu Dec 01 14:28:07 2022 -0800 @@ -51,8 +51,8 @@ // transforms the glob_match::glob function to be glob_match::rpl_glob, // which is not what we want... -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + static bool single_match_exists (const std::string& file) { @@ -61,8 +61,8 @@ return s.exists (); } - namespace sys - { +OCTAVE_BEGIN_NAMESPACE(sys) + bool fnmatch (const string_vector& pat, const std::string& str, int fnm_flags) { @@ -411,5 +411,6 @@ return retval.sort (); } - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/oct-glob.h --- a/liboctave/util/oct-glob.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/oct-glob.h Thu Dec 01 14:28:07 2022 -0800 @@ -30,10 +30,10 @@ #include "str-vec.h" -namespace octave -{ - namespace sys - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(sys) + extern OCTAVE_API bool fnmatch (const string_vector& pat, const std::string& str, int fnmatch_flags); @@ -43,7 +43,8 @@ extern OCTAVE_API string_vector windows_glob (const string_vector&); - } -} + +OCTAVE_END_NAMESPACE(sys) +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/oct-inttypes.h --- a/liboctave/util/oct-inttypes.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/oct-inttypes.h Thu Dec 01 14:28:07 2022 -0800 @@ -40,10 +40,10 @@ #if defined (OCTAVE_INT_USE_LONG_DOUBLE) -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + inline long double round (long double x) { return std::roundl (x); @@ -53,8 +53,9 @@ { return isnan (static_cast (x)); } - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) #endif @@ -928,18 +929,19 @@ // No mixed integer binary operations! -namespace octave -{ - namespace math - { +OCTAVE_BEGIN_NAMESPACE(octave) + +OCTAVE_BEGIN_NAMESPACE(math) + template bool isnan (const octave_int&) { return false; } - } -} + +OCTAVE_END_NAMESPACE(math) +OCTAVE_END_NAMESPACE(octave) // FIXME: can/should any of these be inline? diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/oct-mutex.cc --- a/liboctave/util/oct-mutex.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/oct-mutex.cc Thu Dec 01 14:28:07 2022 -0800 @@ -36,8 +36,8 @@ # include #endif -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + void base_mutex::lock (void) { @@ -178,4 +178,5 @@ } mutex::mutex (void) : m_rep (init_rep ()) { } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/oct-mutex.h --- a/liboctave/util/oct-mutex.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/oct-mutex.h Thu Dec 01 14:28:07 2022 -0800 @@ -30,8 +30,8 @@ #include -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class mutex; class @@ -135,6 +135,7 @@ static bool is_thread (void); }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/oct-refcount.h --- a/liboctave/util/oct-refcount.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/oct-refcount.h Thu Dec 01 14:28:07 2022 -0800 @@ -30,8 +30,8 @@ #include -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + // Encapsulates a reference counter. template @@ -86,6 +86,7 @@ std::atomic m_count; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/oct-shlib.cc --- a/liboctave/util/oct-shlib.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/oct-shlib.cc Thu Dec 01 14:28:07 2022 -0800 @@ -58,8 +58,8 @@ # include "lo-sysdep.h" #endif -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + std::list possibly_unreferenced_dynamic_libraries; void dynamic_library::delete_later (void) @@ -447,4 +447,5 @@ ("support for dynamically loaded libraries was unavailable or disabled when liboctave was built"); #endif } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/oct-shlib.h --- a/liboctave/util/oct-shlib.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/oct-shlib.h Thu Dec 01 14:28:07 2022 -0800 @@ -36,8 +36,8 @@ #include "oct-time.h" #include "oct-refcount.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class dynamic_library { @@ -211,6 +211,7 @@ // event_hook function. OCTAVE_API int release_unreferenced_dynamic_libraries (void); -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/oct-sparse.cc --- a/liboctave/util/oct-sparse.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/oct-sparse.cc Thu Dec 01 14:28:07 2022 -0800 @@ -34,8 +34,8 @@ || defined (HAVE_CHOLMOD) || defined (HAVE_COLAMD) \ || defined (HAVE_CXSPARSE) || defined (HAVE_UMFPACK)) -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + static inline void check_suitesparse_integer_size (void) { @@ -78,6 +78,7 @@ return reinterpret_cast (i); } -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/oct-sparse.h --- a/liboctave/util/oct-sparse.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/oct-sparse.h Thu Dec 01 14:28:07 2022 -0800 @@ -165,8 +165,8 @@ || defined (HAVE_CXSPARSE) || defined (HAVE_SPQR) \ || defined (HAVE_UMFPACK)) -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + # if defined (OCTAVE_ENABLE_64) typedef SuiteSparse_long suitesparse_integer; # else @@ -206,7 +206,8 @@ return static_cast (x); } -} + +OCTAVE_END_NAMESPACE(octave) #endif #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/oct-string.h --- a/liboctave/util/oct-string.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/oct-string.h Thu Dec 01 14:28:07 2022 -0800 @@ -32,8 +32,8 @@ #include "oct-cmplx.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + //! Octave string utility functions. //! //! This functions provide a C++ interface to most string functions @@ -48,8 +48,8 @@ //! In addition, Octave's function only return bool and do not check //! lexicographical order. - namespace string - { +OCTAVE_BEGIN_NAMESPACE(string) + //! True if strings are the same. //! //! ## Specialization for Array @@ -245,8 +245,8 @@ }; - } -} +OCTAVE_END_NAMESPACE(string) +OCTAVE_END_NAMESPACE(octave) template extern OCTAVE_API std::string diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/octave-preserve-stream-state.h --- a/liboctave/util/octave-preserve-stream-state.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/octave-preserve-stream-state.h Thu Dec 01 14:28:07 2022 -0800 @@ -30,8 +30,8 @@ #include -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class preserve_stream_state { @@ -58,6 +58,7 @@ int m_owidth; char m_ofill; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/pathsearch.cc --- a/liboctave/util/pathsearch.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/pathsearch.cc Thu Dec 01 14:28:07 2022 -0800 @@ -37,8 +37,8 @@ #include "oct-env.h" #include "pathsearch.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + directory_path::directory_path (const std::string& s) : m_orig_path (s), m_initialized (false), m_expanded_path (), m_path_elements () @@ -128,4 +128,5 @@ { return SEPCHAR_STR; } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/pathsearch.h --- a/liboctave/util/pathsearch.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/pathsearch.h Thu Dec 01 14:28:07 2022 -0800 @@ -31,8 +31,8 @@ #include #include -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class OCTAVE_API directory_path @@ -100,6 +100,7 @@ void init (void); }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/quit.cc --- a/liboctave/util/quit.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/quit.cc Thu Dec 01 14:28:07 2022 -0800 @@ -42,8 +42,8 @@ void (*octave_signal_hook) (void) = nullptr; void (*octave_interrupt_hook) (void) = nullptr; -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + std::string execution_exception::stack_trace (void) const { std::size_t nframes = m_stack_info.size (); @@ -94,7 +94,8 @@ } } } -} + +OCTAVE_END_NAMESPACE(octave) void octave_handle_signal (void) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/quit.h --- a/liboctave/util/quit.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/quit.h Thu Dec 01 14:28:07 2022 -0800 @@ -42,8 +42,8 @@ #if defined (__cplusplus) -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class frame_info { public: @@ -200,7 +200,8 @@ const char * what (void) const noexcept { return "interrupt exception"; } }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/unwind-prot.cc --- a/liboctave/util/unwind-prot.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/unwind-prot.cc Thu Dec 01 14:28:07 2022 -0800 @@ -30,8 +30,8 @@ #include "lo-error.h" #include "unwind-prot.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + void unwind_protect_safe::warn_unhandled_exception (void) const { @@ -49,4 +49,5 @@ "It is a bug in Octave for this to happen. " "Please help improve Octave by reporting it."); } -} + +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/unwind-prot.h --- a/liboctave/util/unwind-prot.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/unwind-prot.h Thu Dec 01 14:28:07 2022 -0800 @@ -35,8 +35,8 @@ #include "action-container.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + class OCTAVE_API unwind_protect : public action_container @@ -349,6 +349,7 @@ T& m_ref; T m_val; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/url-transfer.cc --- a/liboctave/util/url-transfer.cc Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/url-transfer.cc Thu Dec 01 14:28:07 2022 -0800 @@ -46,8 +46,8 @@ # include #endif -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + base_url_transfer::base_url_transfer (void) : m_host_or_url (), m_valid (false), m_ftp (false), m_ascii_mode (false), m_ok (true), m_errmsg (), @@ -932,4 +932,4 @@ #undef REP_CLASS -} +OCTAVE_END_NAMESPACE(octave) diff -r 9ecc95d840ca -r dfa5d9c3ae72 liboctave/util/url-transfer.h --- a/liboctave/util/url-transfer.h Thu Dec 01 14:01:16 2022 -0800 +++ b/liboctave/util/url-transfer.h Thu Dec 01 14:28:07 2022 -0800 @@ -36,8 +36,8 @@ #include "Array-fwd.h" #include "str-vec.h" -namespace octave -{ +OCTAVE_BEGIN_NAMESPACE(octave) + struct weboptions { std::string UserAgent; @@ -294,6 +294,7 @@ std::shared_ptr m_rep; }; -} + +OCTAVE_END_NAMESPACE(octave) #endif diff -r 9ecc95d840ca -r dfa5d9c3ae72 oct-conf-post-public.in.h --- a/oct-conf-post-public.in.h Thu Dec 01 14:01:16 2022 -0800 +++ b/oct-conf-post-public.in.h Thu Dec 01 14:28:07 2022 -0800 @@ -29,8 +29,8 @@ # include #endif -# define OCTAVE_NAMESPACE_BEGIN namespace octave { -# define OCTAVE_NAMESPACE_END } +#define OCTAVE_BEGIN_NAMESPACE(name) namespace name { +#define OCTAVE_END_NAMESPACE(name) } /* The C++ standard is evolving to allow attribute hints in a compiler-independent manner. In C++ 2011 support for noreturn was