Mercurial > octave
changeset 29989:b260322f6730
move xdiv, xnorm, and xpow inside octave namespace
* xdiv.h, xdiv.cc (elem_xdiv): Rename from x_el_div.
(elem_xdiv, xdiv): Move inside octave namespace. Change all uses.
Provide deprecated wrapper functions to preserve old names.
* xnorm.h, xnorm.cc (xnorm, xcolnorms, xrownorms, xfrobnorm): Move
inside octave namespace. Change all uses. Provide deprecated wrapper
functions to preserve old names.
* xpow.h, xpow.cc (elem_xpow, xpow): Move inside octave namespace.
Change all uses. Provide deprecated wrapper functions to preserve old
names.
* ov-base.cc (install_base_type_conversions): Move inside octave
namespace.
* ops.h: Don't declare install_ops function here.
* ov-typeinfo.cc: Declare install_ops in source file instead of
including ops.h.
* mk-ops.sh: Move generated code inside octave namespace.
* op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc,
op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-class.cc,
op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-s.cc, op-cm-scm.cc,
op-cm-sm.cc, op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc,
op-cs-scm.cc, op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc,
op-dm-template.cc, op-dms-template.cc, op-fcdm-fcdm.cc, op-fcm-fcm.cc,
op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc, op-fcn.cc, op-fcs-fcm.cc,
op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc,
op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc, op-fm-fs.cc, op-fs-fcm.cc,
op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc, op-i16-i16.cc, op-i32-i32.cc,
op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc, op-m-cm.cc, op-m-cs.cc,
op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc, op-mi.cc, op-pm-pm.cc,
op-pm-scm.cc, op-pm-sm.cc, op-pm-template.cc, op-range.cc, op-s-cm.cc,
op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc, op-s-sm.cc,
op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc,
op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc,
op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc,
op-str-m.cc, op-str-s.cc, op-str-str.cc, op-struct.cc,
op-ui16-ui16.cc, op-ui32-ui32.cc, op-ui64-ui64.cc, op-ui8-ui8.cc:
Move operator functions inside octave namespace.
line wrap: on
line diff
--- a/libinterp/corefcn/xdiv.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/corefcn/xdiv.cc Mon Aug 16 21:38:22 2021 -0400 @@ -49,6 +49,8 @@ #include "error.h" #include "xdiv.h" +OCTAVE_NAMESPACE_BEGIN + static void solve_singularity_warning (double rcond) { @@ -195,7 +197,7 @@ // +---+----+ Matrix -x_el_div (double a, const Matrix& b) +elem_xdiv (double a, const Matrix& b) { octave_idx_type nr = b.rows (); octave_idx_type nc = b.columns (); @@ -213,7 +215,7 @@ } ComplexMatrix -x_el_div (double a, const ComplexMatrix& b) +elem_xdiv (double a, const ComplexMatrix& b) { octave_idx_type nr = b.rows (); octave_idx_type nc = b.columns (); @@ -231,7 +233,7 @@ } ComplexMatrix -x_el_div (const Complex a, const Matrix& b) +elem_xdiv (const Complex a, const Matrix& b) { octave_idx_type nr = b.rows (); octave_idx_type nc = b.columns (); @@ -249,7 +251,7 @@ } ComplexMatrix -x_el_div (const Complex a, const ComplexMatrix& b) +elem_xdiv (const Complex a, const ComplexMatrix& b) { octave_idx_type nr = b.rows (); octave_idx_type nc = b.columns (); @@ -276,7 +278,7 @@ // +---+----+ NDArray -x_el_div (double a, const NDArray& b) +elem_xdiv (double a, const NDArray& b) { NDArray result (b.dims ()); @@ -290,7 +292,7 @@ } ComplexNDArray -x_el_div (double a, const ComplexNDArray& b) +elem_xdiv (double a, const ComplexNDArray& b) { ComplexNDArray result (b.dims ()); @@ -304,7 +306,7 @@ } ComplexNDArray -x_el_div (const Complex a, const NDArray& b) +elem_xdiv (const Complex a, const NDArray& b) { ComplexNDArray result (b.dims ()); @@ -318,7 +320,7 @@ } ComplexNDArray -x_el_div (const Complex a, const ComplexNDArray& b) +elem_xdiv (const Complex a, const ComplexNDArray& b) { ComplexNDArray result (b.dims ()); @@ -496,7 +498,7 @@ // +---+----+ FloatMatrix -x_el_div (float a, const FloatMatrix& b) +elem_xdiv (float a, const FloatMatrix& b) { octave_idx_type nr = b.rows (); octave_idx_type nc = b.columns (); @@ -514,7 +516,7 @@ } FloatComplexMatrix -x_el_div (float a, const FloatComplexMatrix& b) +elem_xdiv (float a, const FloatComplexMatrix& b) { octave_idx_type nr = b.rows (); octave_idx_type nc = b.columns (); @@ -532,7 +534,7 @@ } FloatComplexMatrix -x_el_div (const FloatComplex a, const FloatMatrix& b) +elem_xdiv (const FloatComplex a, const FloatMatrix& b) { octave_idx_type nr = b.rows (); octave_idx_type nc = b.columns (); @@ -550,7 +552,7 @@ } FloatComplexMatrix -x_el_div (const FloatComplex a, const FloatComplexMatrix& b) +elem_xdiv (const FloatComplex a, const FloatComplexMatrix& b) { octave_idx_type nr = b.rows (); octave_idx_type nc = b.columns (); @@ -577,7 +579,7 @@ // +---+----+ FloatNDArray -x_el_div (float a, const FloatNDArray& b) +elem_xdiv (float a, const FloatNDArray& b) { FloatNDArray result (b.dims ()); @@ -591,7 +593,7 @@ } FloatComplexNDArray -x_el_div (float a, const FloatComplexNDArray& b) +elem_xdiv (float a, const FloatComplexNDArray& b) { FloatComplexNDArray result (b.dims ()); @@ -605,7 +607,7 @@ } FloatComplexNDArray -x_el_div (const FloatComplex a, const FloatNDArray& b) +elem_xdiv (const FloatComplex a, const FloatNDArray& b) { FloatComplexNDArray result (b.dims ()); @@ -619,7 +621,7 @@ } FloatComplexNDArray -x_el_div (const FloatComplex a, const FloatComplexNDArray& b) +elem_xdiv (const FloatComplex a, const FloatComplexNDArray& b) { FloatComplexNDArray result (b.dims ()); @@ -1008,3 +1010,5 @@ FloatComplexDiagMatrix xleftdiv (const FloatComplexDiagMatrix& a, const FloatComplexDiagMatrix& b) { return dmdm_leftdiv_impl (a, b); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/xdiv.h Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/corefcn/xdiv.h Mon Aug 16 21:38:22 2021 -0400 @@ -31,6 +31,8 @@ #include "mx-defs.h" #include "MatrixType.h" +OCTAVE_NAMESPACE_BEGIN + extern Matrix xdiv (const Matrix& a, const Matrix& b, MatrixType& typ); extern ComplexMatrix xdiv (const Matrix& a, const ComplexMatrix& b, MatrixType& typ); @@ -39,15 +41,15 @@ extern ComplexMatrix xdiv (const ComplexMatrix& a, const ComplexMatrix& b, MatrixType& typ); -extern Matrix x_el_div (double a, const Matrix& b); -extern ComplexMatrix x_el_div (double a, const ComplexMatrix& b); -extern ComplexMatrix x_el_div (const Complex a, const Matrix& b); -extern ComplexMatrix x_el_div (const Complex a, const ComplexMatrix& b); +extern Matrix elem_xdiv (double a, const Matrix& b); +extern ComplexMatrix elem_xdiv (double a, const ComplexMatrix& b); +extern ComplexMatrix elem_xdiv (const Complex a, const Matrix& b); +extern ComplexMatrix elem_xdiv (const Complex a, const ComplexMatrix& b); -extern NDArray x_el_div (double a, const NDArray& b); -extern ComplexNDArray x_el_div (double a, const ComplexNDArray& b); -extern ComplexNDArray x_el_div (const Complex a, const NDArray& b); -extern ComplexNDArray x_el_div (const Complex a, const ComplexNDArray& b); +extern NDArray elem_xdiv (double a, const NDArray& b); +extern ComplexNDArray elem_xdiv (double a, const ComplexNDArray& b); +extern ComplexNDArray elem_xdiv (const Complex a, const NDArray& b); +extern ComplexNDArray elem_xdiv (const Complex a, const ComplexNDArray& b); extern Matrix xleftdiv (const Matrix& a, const Matrix& b, MatrixType& typ, blas_trans_type transt = blas_no_trans); @@ -73,17 +75,17 @@ const FloatComplexMatrix& b, MatrixType& typ); -extern FloatMatrix x_el_div (float a, const FloatMatrix& b); -extern FloatComplexMatrix x_el_div (float a, const FloatComplexMatrix& b); -extern FloatComplexMatrix x_el_div (const FloatComplex a, const FloatMatrix& b); -extern FloatComplexMatrix x_el_div (const FloatComplex a, +extern FloatMatrix elem_xdiv (float a, const FloatMatrix& b); +extern FloatComplexMatrix elem_xdiv (float a, const FloatComplexMatrix& b); +extern FloatComplexMatrix elem_xdiv (const FloatComplex a, const FloatMatrix& b); +extern FloatComplexMatrix elem_xdiv (const FloatComplex a, const FloatComplexMatrix& b); -extern FloatNDArray x_el_div (float a, const FloatNDArray& b); -extern FloatComplexNDArray x_el_div (float a, const FloatComplexNDArray& b); -extern FloatComplexNDArray x_el_div (const FloatComplex a, +extern FloatNDArray elem_xdiv (float a, const FloatNDArray& b); +extern FloatComplexNDArray elem_xdiv (float a, const FloatComplexNDArray& b); +extern FloatComplexNDArray elem_xdiv (const FloatComplex a, const FloatNDArray& b); -extern FloatComplexNDArray x_el_div (const FloatComplex a, +extern FloatComplexNDArray elem_xdiv (const FloatComplex a, const FloatComplexNDArray& b); extern FloatMatrix xleftdiv (const FloatMatrix& a, const FloatMatrix& b, @@ -151,4 +153,413 @@ extern FloatComplexDiagMatrix xleftdiv (const FloatComplexDiagMatrix& a, const FloatComplexDiagMatrix& b); +OCTAVE_NAMESPACE_END + +#if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS) + +OCTAVE_DEPRECATED (7, "use 'octave::xdiv' instead") +inline Matrix +xdiv (const Matrix& a, const Matrix& b, MatrixType& typ) +{ + return octave::xdiv (a, b, typ); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xdiv' instead") +inline ComplexMatrix +xdiv (const Matrix& a, const ComplexMatrix& b, MatrixType& typ) +{ + return octave::xdiv (a, b, typ); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xdiv' instead") +inline ComplexMatrix +xdiv (const ComplexMatrix& a, const Matrix& b, MatrixType& typ) +{ + return octave::xdiv (a, b, typ); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xdiv' instead") +inline ComplexMatrix +xdiv (const ComplexMatrix& a, const ComplexMatrix& b, MatrixType& typ) +{ + return octave::xdiv (a, b, typ); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xdiv' instead") +inline Matrix +x_el_div (double a, const Matrix& b) +{ + return octave::elem_xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xdiv' instead") +inline ComplexMatrix +x_el_div (double a, const ComplexMatrix& b) +{ + return octave::elem_xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xdiv' instead") +inline ComplexMatrix +x_el_div (const Complex a, const Matrix& b) +{ + return octave::elem_xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xdiv' instead") +inline ComplexMatrix +x_el_div (const Complex a, const ComplexMatrix& b) +{ + return octave::elem_xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xdiv' instead") +inline NDArray +x_el_div (double a, const NDArray& b) +{ + return octave::elem_xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xdiv' instead") +inline ComplexNDArray +x_el_div (double a, const ComplexNDArray& b) +{ + return octave::elem_xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xdiv' instead") +inline ComplexNDArray +x_el_div (const Complex a, const NDArray& b) +{ + return octave::elem_xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xdiv' instead") +inline ComplexNDArray +x_el_div (const Complex a, const ComplexNDArray& b) +{ + return octave::elem_xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xleftdiv' instead") +inline Matrix +xleftdiv (const Matrix& a, const Matrix& b, MatrixType& typ, blas_trans_type transt = blas_no_trans) +{ + return octave::xleftdiv (a, b, typ, transt); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xleftdiv' instead") +inline ComplexMatrix +xleftdiv (const Matrix& a, const ComplexMatrix& b, MatrixType& typ, blas_trans_type transt = blas_no_trans) +{ + return octave::xleftdiv (a, b, typ, transt); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xleftdiv' instead") +inline ComplexMatrix +xleftdiv (const ComplexMatrix& a, const Matrix& b, MatrixType& typ, blas_trans_type transt = blas_no_trans) +{ + return octave::xleftdiv (a, b, typ, transt); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xleftdiv' instead") +inline ComplexMatrix +xleftdiv (const ComplexMatrix& a, const ComplexMatrix& b, MatrixType& typ, blas_trans_type transt = blas_no_trans) +{ + return octave::xleftdiv (a, b, typ, transt); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xdiv' instead") +inline FloatMatrix +xdiv (const FloatMatrix& a, const FloatMatrix& b, MatrixType& typ) +{ + return octave::xdiv (a, b, typ); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xdiv' instead") +inline FloatComplexMatrix +xdiv (const FloatMatrix& a, const FloatComplexMatrix& b, MatrixType& typ) +{ + return octave::xdiv (a, b, typ); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xdiv' instead") +inline FloatComplexMatrix +xdiv (const FloatComplexMatrix& a, const FloatMatrix& b, MatrixType& typ) +{ + return octave::xdiv (a, b, typ); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xdiv' instead") +inline FloatComplexMatrix +xdiv (const FloatComplexMatrix& a, const FloatComplexMatrix& b, MatrixType& typ) +{ + return octave::xdiv (a, b, typ); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xdiv' instead") +inline FloatMatrix +x_el_div (float a, const FloatMatrix& b) +{ + return octave::elem_xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xdiv' instead") +inline FloatComplexMatrix +x_el_div (float a, const FloatComplexMatrix& b) +{ + return octave::elem_xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xdiv' instead") +inline FloatComplexMatrix +x_el_div (const FloatComplex a, const FloatMatrix& b) +{ + return octave::elem_xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xdiv' instead") +inline FloatComplexMatrix +x_el_div (const FloatComplex a, const FloatComplexMatrix& b) +{ + return octave::elem_xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xdiv' instead") +inline FloatNDArray +x_el_div (float a, const FloatNDArray& b) +{ + return octave::elem_xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xdiv' instead") +inline FloatComplexNDArray +x_el_div (float a, const FloatComplexNDArray& b) +{ + return octave::elem_xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xdiv' instead") +inline FloatComplexNDArray +x_el_div (const FloatComplex a, const FloatNDArray& b) +{ + return octave::elem_xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xdiv' instead") +inline FloatComplexNDArray +x_el_div (const FloatComplex a, const FloatComplexNDArray& b) +{ + return octave::elem_xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xleftdiv' instead") +inline FloatMatrix +xleftdiv (const FloatMatrix& a, const FloatMatrix& b, + MatrixType& typ, blas_trans_type transt = blas_no_trans) +{ + return octave::xleftdiv (a, b, typ, transt); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xleftdiv' instead") +inline FloatComplexMatrix +xleftdiv (const FloatMatrix& a, const FloatComplexMatrix& b, + MatrixType& typ, blas_trans_type transt = blas_no_trans) +{ + return octave::xleftdiv (a, b, typ, transt); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xleftdiv' instead") +inline FloatComplexMatrix +xleftdiv (const FloatComplexMatrix& a, const FloatMatrix& b, + MatrixType& typ, blas_trans_type transt = blas_no_trans) +{ + return octave::xleftdiv (a, b, typ, transt); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xleftdiv' instead") +inline FloatComplexMatrix +xleftdiv (const FloatComplexMatrix& a, const FloatComplexMatrix& b, + MatrixType& typ, blas_trans_type transt = blas_no_trans) +{ + return octave::xleftdiv (a, b, typ, transt); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xdiv' instead") +inline Matrix +xdiv (const Matrix& a, const DiagMatrix& b) +{ + return octave::xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xdiv' instead") +inline ComplexMatrix +xdiv (const ComplexMatrix& a, const DiagMatrix& b) +{ + return octave::xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xdiv' instead") +inline ComplexMatrix +xdiv (const ComplexMatrix& a, const ComplexDiagMatrix& b) +{ + return octave::xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xdiv' instead") +inline DiagMatrix +xdiv (const DiagMatrix& a, const DiagMatrix& b) +{ + return octave::xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xdiv' instead") +inline ComplexDiagMatrix +xdiv (const ComplexDiagMatrix& a, const DiagMatrix& b) +{ + return octave::xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xdiv' instead") +inline ComplexDiagMatrix +xdiv (const ComplexDiagMatrix& a, const ComplexDiagMatrix& b) +{ + return octave::xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xdiv' instead") +inline FloatMatrix +xdiv (const FloatMatrix& a, const FloatDiagMatrix& b) +{ + return octave::xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xdiv' instead") +inline FloatComplexMatrix +xdiv (const FloatComplexMatrix& a, const FloatDiagMatrix& b) +{ + return octave::xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xdiv' instead") +inline FloatComplexMatrix +xdiv (const FloatMatrix& a, const FloatComplexDiagMatrix& b) +{ + return octave::xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xdiv' instead") +inline FloatComplexMatrix +xdiv (const FloatComplexMatrix& a, const FloatComplexDiagMatrix& b) +{ + return octave::xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xdiv' instead") +inline FloatDiagMatrix +xdiv (const FloatDiagMatrix& a, const FloatDiagMatrix& b) +{ + return octave::xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xdiv' instead") +inline FloatComplexDiagMatrix +xdiv (const FloatComplexDiagMatrix& a, const FloatDiagMatrix& b) +{ + return octave::xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xdiv' instead") +inline FloatComplexDiagMatrix +xdiv (const FloatComplexDiagMatrix& a, const FloatComplexDiagMatrix& b) +{ + return octave::xdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xleftdiv' instead") +inline Matrix +xleftdiv (const DiagMatrix& a, const Matrix& b) +{ + return octave::xleftdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xleftdiv' instead") +inline ComplexMatrix +xleftdiv (const DiagMatrix& a, const ComplexMatrix& b) +{ + return octave::xleftdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xleftdiv' instead") +inline ComplexMatrix +xleftdiv (const ComplexDiagMatrix& a, const ComplexMatrix& b) +{ + return octave::xleftdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xleftdiv' instead") +inline DiagMatrix +xleftdiv (const DiagMatrix& a, const DiagMatrix& b) +{ + return octave::xleftdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xleftdiv' instead") +inline ComplexDiagMatrix +xleftdiv (const DiagMatrix& a, const ComplexDiagMatrix& b) +{ + return octave::xleftdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xleftdiv' instead") +inline ComplexDiagMatrix +xleftdiv (const ComplexDiagMatrix& a, const ComplexDiagMatrix& b) +{ + return octave::xleftdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xleftdiv' instead") +inline FloatMatrix +xleftdiv (const FloatDiagMatrix& a, const FloatMatrix& b) +{ + return octave::xleftdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xleftdiv' instead") +inline FloatComplexMatrix +xleftdiv (const FloatDiagMatrix& a, const FloatComplexMatrix& b) +{ + return octave::xleftdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xleftdiv' instead") +inline FloatComplexMatrix +xleftdiv (const FloatComplexDiagMatrix& a, const FloatComplexMatrix& b) +{ + return octave::xleftdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xleftdiv' instead") +inline FloatDiagMatrix +xleftdiv (const FloatDiagMatrix& a, const FloatDiagMatrix& b) +{ + return octave::xleftdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xleftdiv' instead") +inline FloatComplexDiagMatrix +xleftdiv (const FloatDiagMatrix& a, const FloatComplexDiagMatrix& b) +{ + return octave::xleftdiv (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xleftdiv' instead") +inline FloatComplexDiagMatrix +xleftdiv (const FloatComplexDiagMatrix& a, const FloatComplexDiagMatrix& b) +{ + return octave::xleftdiv (a, b); +} + #endif + +#endif
--- a/libinterp/corefcn/xnorm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/corefcn/xnorm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -33,6 +33,8 @@ #include "ov.h" #include "xnorm.h" +OCTAVE_NAMESPACE_BEGIN + octave_value xnorm (const octave_value& x, const octave_value& p) { octave_value retval; @@ -200,3 +202,5 @@ return retval; } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/xnorm.h Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/corefcn/xnorm.h Mon Aug 16 21:38:22 2021 -0400 @@ -32,6 +32,8 @@ class octave_value; +OCTAVE_NAMESPACE_BEGIN + extern OCTINTERP_API octave_value xnorm (const octave_value& x, const octave_value& p); @@ -44,4 +46,38 @@ extern OCTINTERP_API octave_value xfrobnorm (const octave_value& x); +OCTAVE_NAMESPACE_END + +#if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS) + +OCTAVE_DEPRECATED (7, "use 'octave::xnorm' instead") +inline octave_value +xnorm (const octave_value& x, const octave_value& p) +{ + return octave::xnorm (x, p); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xcolnorms' instead") +inline octave_value +xcolnorms (const octave_value& x, const octave_value& p) +{ + return octave::xcolnorms (x, p); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xrownorms' instead") +inline octave_value +xrownorms (const octave_value& x, const octave_value& p) +{ + return octave::xrownorms (x, p); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xfrobnorm' instead") +inline octave_value +xfrobnorm (const octave_value& x) +{ + return octave::xfrobnorm (x); +} + #endif + +#endif
--- a/libinterp/corefcn/xpow.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/corefcn/xpow.cc Mon Aug 16 21:38:22 2021 -0400 @@ -56,6 +56,7 @@ #include "bsxfun.h" +OCTAVE_NAMESPACE_BEGIN static void err_failed_diagonalization (void) @@ -2812,3 +2813,5 @@ return result; } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/xpow.h Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/corefcn/xpow.h Mon Aug 16 21:38:22 2021 -0400 @@ -46,6 +46,8 @@ class octave_value; class Range; +OCTAVE_NAMESPACE_BEGIN + extern OCTINTERP_API octave_value xpow (double a, double b); extern OCTINTERP_API octave_value xpow (double a, const Matrix& b); extern OCTINTERP_API octave_value xpow (double a, const Complex& b); @@ -203,4 +205,591 @@ extern OCTINTERP_API octave_value elem_xpow (const FloatComplexNDArray& a, const FloatComplexNDArray& b); +OCTAVE_NAMESPACE_END + +#if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS) + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (double a, double b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (double a, const Matrix& b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (double a, const Complex& b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (double a, const ComplexMatrix& b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const Matrix& a, double b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const Matrix& a, const Complex& b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const DiagMatrix& a, double b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const DiagMatrix& a, const Complex& b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const PermMatrix& a, double b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const Complex& a, double b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const Complex& a, const Matrix& b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const Complex& a, const Complex& b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const Complex& a, const ComplexMatrix& b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const ComplexMatrix& a, double b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const ComplexMatrix& a, const Complex& b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const ComplexDiagMatrix& a, double b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const ComplexDiagMatrix& a, const Complex& b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (double a, const Matrix& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (double a, const ComplexMatrix& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (double a, const octave::range<double>& r) +{ + return octave::elem_xpow (a, r); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const Matrix& a, double b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const Matrix& a, const Matrix& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const Matrix& a, const Complex& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const Matrix& a, const ComplexMatrix& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const Complex& a, const Matrix& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const Complex& a, const ComplexMatrix& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const Complex& a, const octave::range<double>& r) +{ + return octave::elem_xpow (a, r); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const ComplexMatrix& a, double b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const ComplexMatrix& a, const Matrix& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const ComplexMatrix& a, const Complex& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const ComplexMatrix& a, const ComplexMatrix& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (double a, const NDArray& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (double a, const ComplexNDArray& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const NDArray& a, double b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const NDArray& a, const NDArray& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const NDArray& a, const Complex& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const NDArray& a, const ComplexNDArray& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const Complex& a, const NDArray& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const Complex& a, const ComplexNDArray& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const ComplexNDArray& a, double b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const ComplexNDArray& a, const NDArray& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const ComplexNDArray& a, const Complex& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const ComplexNDArray& a, const ComplexNDArray& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (float a, float b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (float a, const FloatMatrix& b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (float a, const FloatComplex& b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (float a, const FloatComplexMatrix& b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const FloatMatrix& a, float b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const FloatMatrix& a, const FloatComplex& b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const FloatDiagMatrix& a, float b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const FloatDiagMatrix& a, const FloatComplex& b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const FloatComplex& a, float b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const FloatComplex& a, const FloatMatrix& b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const FloatComplex& a, const FloatComplex& b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const FloatComplex& a, const FloatComplexMatrix& b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const FloatComplexMatrix& a, float b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const FloatComplexMatrix& a, const FloatComplex& b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const FloatComplexDiagMatrix& a, float b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::xpow' instead") +inline octave_value +xpow (const FloatComplexDiagMatrix& a, const FloatComplex& b) +{ + return octave::xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (float a, const FloatMatrix& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (float a, const FloatComplexMatrix& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const FloatMatrix& a, float b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const FloatMatrix& a, const FloatMatrix& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const FloatMatrix& a, const FloatComplex& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const FloatMatrix& a, const FloatComplexMatrix& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const FloatComplex& a, const FloatMatrix& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const FloatComplex& a, const FloatComplexMatrix& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const FloatComplexMatrix& a, float b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const FloatComplexMatrix& a, const FloatMatrix& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const FloatComplexMatrix& a, const FloatComplex& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const FloatComplexMatrix& a, const FloatComplexMatrix& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (float a, const FloatNDArray& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (float a, const FloatComplexNDArray& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const FloatNDArray& a, float b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const FloatNDArray& a, const FloatNDArray& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const FloatNDArray& a, const FloatComplex& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const FloatNDArray& a, const FloatComplexNDArray& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const FloatComplex& a, const FloatNDArray& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const FloatComplex& a, const FloatComplexNDArray& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const FloatComplexNDArray& a, float b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const FloatComplexNDArray& a, const FloatNDArray& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const FloatComplexNDArray& a, const FloatComplex& b) +{ + return octave::elem_xpow (a, b); +} + +OCTAVE_DEPRECATED (7, "use 'octave::elem_xpow' instead") +inline octave_value +elem_xpow (const FloatComplexNDArray& a, const FloatComplexNDArray& b) +{ + return octave::elem_xpow (a, b); +} + #endif + +#endif
--- a/libinterp/octave-value/ov-base.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/octave-value/ov-base.cc Mon Aug 16 21:38:22 2021 -0400 @@ -1524,6 +1524,8 @@ return (fcn && fcn->name () == "builtin"); } +OCTAVE_NAMESPACE_BEGIN + void install_base_type_conversions (octave::type_info& ti) { @@ -1545,8 +1547,6 @@ INSTALL_WIDENOP_TI (ti, octave_base_value, octave_cell, cell_conv); } -OCTAVE_NAMESPACE_BEGIN - DEFUN (sparse_auto_mutate, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {@var{val} =} sparse_auto_mutate ()
--- a/libinterp/octave-value/ov-typeinfo.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/octave-value/ov-typeinfo.cc Mon Aug 16 21:38:22 2021 -0400 @@ -35,12 +35,13 @@ #include "error.h" #include "interpreter.h" #include "interpreter-private.h" -#include "ops.h" #include "ov-typeinfo.h" #include "ov.h" OCTAVE_NAMESPACE_BEGIN + extern void install_ops (type_info& ti); + // FIXME: we should also store all class names and provide a // way to list them (calling class with nargin == 0?).
--- a/libinterp/operators/mk-ops.sh Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/mk-ops.sh Mon Aug 16 21:38:22 2021 -0400 @@ -36,6 +36,8 @@ #include "ov-typeinfo.h" +OCTAVE_NAMESPACE_BEGIN + extern void install_base_type_conversions (octave::type_info&); EOF @@ -61,6 +63,9 @@ cat << \EOF } + +OCTAVE_NAMESPACE_END + EOF exit 0
--- a/libinterp/operators/op-b-b.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-b-b.cc Mon Aug 16 21:38:22 2021 -0400 @@ -54,6 +54,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // bool unary ops. // scalar unary ops. @@ -142,3 +144,5 @@ INSTALL_ASSIGNCONV_TI (ti, octave_bool, octave_null_str, octave_bool_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_bool, octave_null_sq_str, octave_bool_matrix); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-b-bm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-b-bm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -41,6 +41,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // bool matrix by bool ops. DEFNDBINOP_FN (el_and, bool, bool_matrix, bool, bool_array, mx_el_and) @@ -82,3 +84,5 @@ INSTALL_WIDENOP_TI (ti, octave_bool, octave_bool_matrix, bool_matrix_conv); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-b-sbm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-b-sbm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -39,6 +39,8 @@ #include "ov-re-sparse.h" #include "ov-bool-sparse.h" +OCTAVE_NAMESPACE_BEGIN + // bool by sparse bool matrix ops. DEFBINOP_FN (ne, bool, sparse_bool_matrix, mx_el_ne) @@ -101,3 +103,5 @@ INSTALL_WIDENOP_TI (ti, octave_bool, octave_sparse_bool_matrix, sparse_bool_matrix_conv); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-bm-b.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-bm-b.cc Mon Aug 16 21:38:22 2021 -0400 @@ -50,6 +50,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // bool matrix by bool ops. DEFNDBINOP_FN (el_and, bool_matrix, bool, bool_array, bool, mx_el_and) @@ -121,3 +123,5 @@ INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_bool_matrix, octave_uint64_scalar, conv_and_assign); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-bm-bm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-bm-bm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -51,6 +51,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // unary bool matrix ops. DEFNDUNOP_OP (not, bool_matrix, bool_array, !) @@ -203,3 +205,5 @@ INSTALL_ASSIGNOP_TI (ti, op_el_or_eq, octave_bool_matrix, octave_bool_matrix, assign_or); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-bm-sbm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-bm-sbm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -41,6 +41,8 @@ #include "smx-bm-sbm.h" #include "smx-sbm-bm.h" +OCTAVE_NAMESPACE_BEGIN + // bool matrix by sparse bool matrix ops. DEFBINOP_FN (eq, bool_matrix, sparse_bool_matrix, mx_el_eq) @@ -109,3 +111,5 @@ INSTALL_WIDENOP_TI (ti, octave_bool_matrix, octave_sparse_bool_matrix, sparse_bool_matrix_conv); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-cdm-cdm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-cdm-cdm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -38,6 +38,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // matrix unary ops. DEFUNOP_OP (uplus, complex_diag_matrix, /* no-op */) @@ -121,3 +123,5 @@ INSTALL_WIDENOP_TI (ti, octave_complex_diag_matrix, octave_complex_matrix, complex_diag_matrix_to_complex_matrix); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-cell.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-cell.cc Mon Aug 16 21:38:22 2021 -0400 @@ -37,6 +37,8 @@ #include "ov-null-mat.h" #include "ops.h" +OCTAVE_NAMESPACE_BEGIN + // cell ops. DEFUNOP (transpose, cell) @@ -71,3 +73,5 @@ INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_cell, octave_null_sq_str, null_assign); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-chm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-chm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -38,6 +38,8 @@ #include "ov-typeinfo.h" #include "ops.h" +OCTAVE_NAMESPACE_BEGIN + // char matrix unary ops. DEFUNOP (transpose, char_matrix) @@ -110,3 +112,5 @@ INSTALL_CATOP_TI (ti, octave_scalar, octave_char_matrix, s_chm); INSTALL_CATOP_TI (ti, octave_matrix, octave_char_matrix, m_chm); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-class.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-class.cc Mon Aug 16 21:38:22 2021 -0400 @@ -43,6 +43,8 @@ #include "symtab.h" #include "parse.h" +OCTAVE_NAMESPACE_BEGIN + //! Default unary class operator. //! //! @param a operand @@ -222,3 +224,5 @@ ti.install_binary_class_op (octave_value::op_el_and, oct_binop_and); ti.install_binary_class_op (octave_value::op_el_or, oct_binop_or); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-cm-cm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-cm-cm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -38,6 +38,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // unary complex matrix ops. DEFNDUNOP_OP (not, complex_matrix, complex_array, !) @@ -326,3 +328,5 @@ octave_complex_matrix, assign_el_div); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-cm-cs.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-cm-cs.cc Mon Aug 16 21:38:22 2021 -0400 @@ -37,6 +37,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // complex matrix by complex scalar ops. DEFNDBINOP_OP (add, complex_matrix, complex, complex_array, complex, +) @@ -102,7 +104,7 @@ = dynamic_cast<const octave_complex_matrix&> (a1); const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2); - return x_el_div (v2.complex_value (), v1.complex_array_value ()); + return elem_xdiv (v2.complex_value (), v1.complex_array_value ()); } DEFNDBINOP_FN (el_and, complex_matrix, complex, complex_array, complex, @@ -165,3 +167,5 @@ octave_complex_scalar, assign_div); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-cm-m.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-cm-m.cc Mon Aug 16 21:38:22 2021 -0400 @@ -42,6 +42,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // complex matrix by matrix ops. DEFNDBINOP_OP (add, complex_matrix, matrix, complex_array, array, +) @@ -154,3 +156,5 @@ INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, octave_matrix, assign); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-cm-s.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-cm-s.cc Mon Aug 16 21:38:22 2021 -0400 @@ -40,6 +40,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // complex matrix by scalar ops. DEFNDBINOP_OP (add, complex_matrix, scalar, complex_array, scalar, +) @@ -99,7 +101,7 @@ = dynamic_cast<const octave_complex_matrix&> (a1); const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2); - return x_el_div (v2.double_value (), v1.complex_array_value ()); + return elem_xdiv (v2.double_value (), v1.complex_array_value ()); } DEFNDBINOP_FN (el_and, complex_matrix, scalar, complex_array, scalar, mx_el_and) @@ -145,3 +147,5 @@ INSTALL_ASSIGNOP_TI (ti, op_div_eq, octave_complex_matrix, octave_scalar, assign_div); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-cm-scm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-cm-scm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -40,6 +40,8 @@ #include "smx-cm-scm.h" #include "ov-cx-sparse.h" +OCTAVE_NAMESPACE_BEGIN + // complex matrix by sparse complex matrix ops. DEFBINOP_OP (add, complex_matrix, sparse_complex_matrix, +) @@ -205,3 +207,5 @@ INSTALL_WIDENOP_TI (ti, octave_complex_matrix, octave_sparse_complex_matrix, sparse_complex_matrix_conv); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-cm-sm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-cm-sm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -40,6 +40,8 @@ #include "smx-cm-sm.h" #include "ov-re-sparse.h" +OCTAVE_NAMESPACE_BEGIN + // complex matrix by sparse matrix ops. DEFBINOP_OP (add, complex_matrix, sparse_matrix, +) @@ -172,3 +174,5 @@ octave_complex_matrix) } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-cs-cm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-cs-cm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -36,6 +36,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // complex scalar by complex matrix ops. DEFNDBINOP_OP (add, complex, complex_matrix, complex, complex_array, +) @@ -84,7 +86,7 @@ DEFNDBINOP_OP (el_mul, complex, complex_matrix, complex, complex_array, *) DEFNDBINOP_FN (el_div, complex, complex_matrix, complex, complex_array, - x_el_div) + elem_xdiv) DEFNDBINOP_FN (el_pow, complex, complex_matrix, complex, complex_array, elem_xpow) @@ -143,3 +145,5 @@ INSTALL_WIDENOP_TI (ti, octave_complex, octave_complex_matrix, complex_matrix_conv); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-cs-cs.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-cs-cs.cc Mon Aug 16 21:38:22 2021 -0400 @@ -40,6 +40,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // unary complex scalar ops. DEFUNOP (not, complex) @@ -178,3 +180,5 @@ INSTALL_ASSIGNCONV_TI (ti, octave_complex, octave_null_sq_str, octave_complex_matrix); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-cs-m.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-cs-m.cc Mon Aug 16 21:38:22 2021 -0400 @@ -42,6 +42,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // complex scalar by matrix ops. DEFNDBINOP_OP (add, complex, matrix, complex, array, +) @@ -81,7 +83,7 @@ DEFNDCMPLXCMPOP_FN (ne, complex, matrix, complex, array, mx_el_ne) DEFNDBINOP_OP (el_mul, complex, matrix, complex, array, *) -DEFNDBINOP_FN (el_div, complex, matrix, complex, array, x_el_div) +DEFNDBINOP_FN (el_div, complex, matrix, complex, array, elem_xdiv) DEFNDBINOP_FN (el_pow, complex, matrix, complex, array, elem_xpow) DEFBINOP (el_ldiv, complex, matrix) @@ -124,3 +126,5 @@ INSTALL_ASSIGNCONV_TI (ti, octave_complex, octave_matrix, octave_complex_matrix); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-cs-s.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-cs-s.cc Mon Aug 16 21:38:22 2021 -0400 @@ -37,6 +37,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // complex scalar by scalar ops. DEFBINOP_OP (add, complex, scalar, +) @@ -133,3 +135,5 @@ INSTALL_ASSIGNCONV_TI (ti, octave_complex, octave_scalar, octave_complex_matrix); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-cs-scm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-cs-scm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -39,6 +39,8 @@ #include "sparse-xdiv.h" #include "ov-cx-sparse.h" +OCTAVE_NAMESPACE_BEGIN + // complex scalar by sparse complex matrix ops. DEFBINOP_OP (add, complex, sparse_complex_matrix, +) @@ -166,3 +168,5 @@ INSTALL_WIDENOP_TI (ti, octave_complex, octave_sparse_complex_matrix, sparse_complex_matrix_conv); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-cs-sm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-cs-sm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -41,6 +41,8 @@ #include "smx-cs-sm.h" #include "smx-sm-cs.h" +OCTAVE_NAMESPACE_BEGIN + // complex by sparse matrix ops. DEFBINOP_OP (add, complex, sparse_matrix, +) @@ -149,3 +151,5 @@ INSTALL_WIDENOP_TI (ti, octave_complex, octave_sparse_matrix, sparse_matrix_conv); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-dm-dm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-dm-dm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -38,6 +38,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // matrix unary ops. DEFUNOP_OP (uplus, diag_matrix, /* no-op */) @@ -98,3 +100,5 @@ INSTALL_WIDENOP_TI (ti, octave_diag_matrix, octave_matrix, diag_matrix_to_matrix); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-dm-scm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-dm-scm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -48,6 +48,8 @@ #include "sparse-xdiv.h" +OCTAVE_NAMESPACE_BEGIN + // diagonal matrix by sparse matrix ops DEFBINOP (mul_dm_scm, diag_matrix, sparse_complex_matrix) @@ -585,3 +587,5 @@ INSTALL_BINOP_TI (ti, op_sub, octave_sparse_complex_matrix, octave_complex_diag_matrix, sub_scm_cdm); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-dm-sm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-dm-sm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -37,6 +37,8 @@ #include "sparse-xdiv.h" +OCTAVE_NAMESPACE_BEGIN + // diagonal matrix by sparse matrix ops DEFBINOP (mul_dm_sm, diag_matrix, sparse_matrix) @@ -203,3 +205,5 @@ INSTALL_BINOP_TI (ti, op_div, octave_sparse_matrix, octave_diag_matrix, div_sm_dm); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-dm-template.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-dm-template.cc Mon Aug 16 21:38:22 2021 -0400 @@ -39,6 +39,8 @@ # include "ov-null-mat.h" #endif +OCTAVE_NAMESPACE_BEGIN + // matrix by diag matrix ops. DEFBINOP_OP (add, LMATRIX, RMATRIX, +) @@ -102,3 +104,5 @@ INSTALL_ASSIGNCONV_TI (ti, OCTAVE_LMATRIX, octave_null_sq_str, OCTAVE_LDMATRIX); #endif } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-dms-template.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-dms-template.cc Mon Aug 16 21:38:22 2021 -0400 @@ -42,6 +42,8 @@ # define MATRIXV MATRIX #endif +OCTAVE_NAMESPACE_BEGIN + DEFNDBINOP_OP (sdmmul, SCALAR, MATRIX, SCALARV, MATRIXV, *) DEFNDBINOP_OP (dmsmul, MATRIX, SCALAR, MATRIXV, SCALARV, *) @@ -86,3 +88,5 @@ INSTALL_BINOP_TI (ti, op_ldiv, OCTAVE_SCALAR, OCTAVE_MATRIX, sdmldiv); INSTALL_BINOP_TI (ti, op_pow, OCTAVE_MATRIX, OCTAVE_SCALAR, dmspow); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-fcdm-fcdm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-fcdm-fcdm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -38,6 +38,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // matrix unary ops. DEFUNOP_OP (uplus, float_complex_diag_matrix, /* no-op */) @@ -118,3 +120,5 @@ octave_complex_diag_matrix, float_complex_diag_matrix_to_complex_diag_matrix); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-fcm-fcm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-fcm-fcm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -38,6 +38,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // unary complex matrix ops. DEFNDUNOP_OP (not, float_complex_matrix, float_complex_array, !) @@ -350,3 +352,5 @@ INSTALL_ASSIGNOP_TI (ti, op_el_div_eq, octave_float_complex_matrix, octave_float_complex_matrix, assign_el_div); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-fcm-fcs.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-fcm-fcs.cc Mon Aug 16 21:38:22 2021 -0400 @@ -38,6 +38,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // complex matrix by complex scalar ops. DEFNDBINOP_OP (add, float_complex_matrix, float_complex, @@ -111,7 +113,7 @@ const octave_float_complex& v2 = dynamic_cast<const octave_float_complex&> (a2); - return x_el_div (v2.float_complex_value (), v1.float_complex_array_value ()); + return elem_xdiv (v2.float_complex_value (), v1.float_complex_array_value ()); } DEFNDBINOP_FN (el_and, float_complex_matrix, float_complex, @@ -201,3 +203,5 @@ INSTALL_ASSIGNOP_TI (ti, op_div_eq, octave_float_complex_matrix, octave_float_complex_scalar, assign_div); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-fcm-fm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-fcm-fm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -44,6 +44,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // complex matrix by matrix ops. DEFNDBINOP_OP (add, float_complex_matrix, float_matrix, float_complex_array, @@ -204,3 +206,5 @@ INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_complex_matrix, octave_float_matrix, dbl_assign); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-fcm-fs.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-fcm-fs.cc Mon Aug 16 21:38:22 2021 -0400 @@ -41,6 +41,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // complex matrix by scalar ops. DEFNDBINOP_OP (add, float_complex_matrix, float_scalar, float_complex_array, @@ -115,7 +117,7 @@ const octave_float_scalar& v2 = dynamic_cast<const octave_float_scalar&> (a2); - return x_el_div (v2.float_value (), v1.float_complex_array_value ()); + return elem_xdiv (v2.float_value (), v1.float_complex_array_value ()); } DEFNDBINOP_FN (el_and, float_complex_matrix, float_scalar, float_complex_array, @@ -202,3 +204,5 @@ INSTALL_ASSIGNOP_TI (ti, op_div_eq, octave_float_complex_matrix, octave_float_scalar, assign_div); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-fcn.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-fcn.cc Mon Aug 16 21:38:22 2021 -0400 @@ -35,6 +35,8 @@ #include "ov-typeinfo.h" #include "ops.h" +OCTAVE_NAMESPACE_BEGIN + DEFBINOP (eq, fcn_handle, fcn_handle) { const octave_fcn_handle& v1 = dynamic_cast<const octave_fcn_handle&> (a1); @@ -57,3 +59,5 @@ INSTALL_BINOP_TI (ti, op_eq, octave_fcn_handle, octave_fcn_handle, eq); INSTALL_BINOP_TI (ti, op_ne, octave_fcn_handle, octave_fcn_handle, ne); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-fcs-fcm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-fcs-fcm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -38,6 +38,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // complex scalar by complex matrix ops. DEFNDBINOP_OP (add, float_complex, float_complex_matrix, float_complex, @@ -92,7 +94,7 @@ DEFNDBINOP_OP (el_mul, float_complex, float_complex_matrix, float_complex, float_complex_array, *) DEFNDBINOP_FN (el_div, float_complex, float_complex_matrix, float_complex, - float_complex_array, x_el_div) + float_complex_array, elem_xdiv) DEFNDBINOP_FN (el_pow, float_complex, float_complex_matrix, float_complex, float_complex_array, elem_xpow) @@ -189,3 +191,5 @@ INSTALL_WIDENOP_TI (ti, octave_float_complex, octave_float_complex_matrix, float_complex_matrix_conv); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-fcs-fcs.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-fcs-fcs.cc Mon Aug 16 21:38:22 2021 -0400 @@ -38,6 +38,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // unary complex scalar ops. DEFUNOP (not, float_complex) @@ -197,3 +199,5 @@ INSTALL_ASSIGNCONV_TI (ti, octave_float_complex, octave_null_sq_str, octave_float_complex_matrix); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-fcs-fm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-fcs-fm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -43,6 +43,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // complex scalar by matrix ops. DEFNDBINOP_OP (add, float_complex, float_matrix, float_complex, float_array, +) @@ -90,7 +92,7 @@ DEFNDBINOP_OP (el_mul, float_complex, float_matrix, float_complex, float_array, *) DEFNDBINOP_FN (el_div, float_complex, float_matrix, float_complex, - float_array, x_el_div) + float_array, elem_xdiv) DEFNDBINOP_FN (el_pow, float_complex, float_matrix, float_complex, float_array, elem_xpow) @@ -153,3 +155,5 @@ INSTALL_ASSIGNCONV_TI (ti, octave_complex, octave_float_matrix, octave_complex_matrix); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-fcs-fs.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-fcs-fs.cc Mon Aug 16 21:38:22 2021 -0400 @@ -40,6 +40,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // complex scalar by scalar ops. DEFBINOP_OP (add, float_complex, float_scalar, +) @@ -156,3 +158,5 @@ INSTALL_ASSIGNCONV_TI (ti, octave_float_complex, octave_scalar, octave_float_complex_matrix); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-fdm-fdm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-fdm-fdm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -38,6 +38,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // matrix unary ops. DEFUNOP_OP (uplus, float_diag_matrix, /* no-op */) @@ -115,3 +117,5 @@ INSTALL_WIDENOP_TI (ti, octave_float_diag_matrix, octave_float_matrix, float_diag_matrix_to_float_matrix); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-fm-fcm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-fm-fcm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -44,6 +44,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // matrix by complex matrix ops. DEFNDBINOP_OP (add, float_matrix, float_complex_matrix, float_array, @@ -230,3 +232,5 @@ INSTALL_WIDENOP_TI (ti, octave_float_matrix, octave_float_complex_matrix, float_complex_matrix_conv); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-fm-fcs.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-fm-fcs.cc Mon Aug 16 21:38:22 2021 -0400 @@ -45,6 +45,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // matrix by complex scalar ops. DEFNDBINOP_OP (add, float_matrix, float_complex, float_array, float_complex, +) @@ -108,7 +110,7 @@ const octave_float_matrix& v1 = dynamic_cast<const octave_float_matrix&> (a1); const octave_float_complex& v2 = dynamic_cast<const octave_float_complex&> (a2); - return x_el_div (v2.float_complex_value (), v1.float_array_value ()); + return elem_xdiv (v2.float_complex_value (), v1.float_array_value ()); } DEFNDBINOP_FN (el_and, float_matrix, float_complex, float_array, @@ -162,3 +164,5 @@ INSTALL_ASSIGNCONV_TI (ti, octave_matrix, octave_float_complex, octave_complex_matrix); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-fm-fm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-fm-fm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -38,6 +38,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // matrix unary ops. DEFNDUNOP_OP (not, float_matrix, float_array, !) @@ -272,3 +274,5 @@ INSTALL_ASSIGNOP_TI (ti, op_el_div_eq, octave_float_matrix, octave_float_matrix, assign_el_div); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-fm-fs.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-fm-fs.cc Mon Aug 16 21:38:22 2021 -0400 @@ -37,6 +37,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // matrix by scalar ops. DEFNDBINOP_OP (add, float_matrix, float_scalar, float_array, float_scalar, +) @@ -99,7 +101,7 @@ const octave_float_matrix& v1 = dynamic_cast<const octave_float_matrix&> (a1); const octave_float_scalar& v2 = dynamic_cast<const octave_float_scalar&> (a2); - return x_el_div (v2.float_value (), v1.float_array_value ()); + return elem_xdiv (v2.float_value (), v1.float_array_value ()); } DEFNDBINOP_FN (el_and, float_matrix, float_scalar, float_array, @@ -168,3 +170,5 @@ INSTALL_ASSIGNOP_TI (ti, op_div_eq, octave_float_matrix, octave_float_scalar, assign_div); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-fs-fcm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-fs-fcm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -44,6 +44,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // scalar by complex matrix ops. DEFNDBINOP_OP (add, float_scalar, float_complex_matrix, float_scalar, @@ -98,7 +100,7 @@ DEFNDBINOP_OP (el_mul, float_scalar, float_complex_matrix, float_scalar, float_complex_array, *) DEFNDBINOP_FN (el_div, float_scalar, float_complex_matrix, float_scalar, - float_complex_array, x_el_div) + float_complex_array, elem_xdiv) DEFNDBINOP_FN (el_pow, float_scalar, float_complex_matrix, float_scalar, float_complex_array, elem_xpow) @@ -186,3 +188,5 @@ INSTALL_WIDENOP_TI (ti, octave_float_scalar, octave_float_complex_matrix, float_complex_matrix_conv); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-fs-fcs.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-fs-fcs.cc Mon Aug 16 21:38:22 2021 -0400 @@ -40,6 +40,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // scalar by complex scalar ops. DEFBINOP_OP (add, float_scalar, float_complex, +) @@ -155,3 +157,5 @@ INSTALL_ASSIGNCONV_TI (ti, octave_scalar, octave_float_complex, octave_complex_matrix); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-fs-fm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-fs-fm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -38,6 +38,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // scalar by matrix ops. DEFNDBINOP_OP (add, float_scalar, float_matrix, float_scalar, float_array, +) @@ -85,7 +87,7 @@ DEFNDBINOP_OP (el_mul, float_scalar, float_matrix, float_scalar, float_array, *) DEFNDBINOP_FN (el_div, float_scalar, float_matrix, float_scalar, - float_array, x_el_div) + float_array, elem_xdiv) DEFNDBINOP_FN (el_pow, float_scalar, float_matrix, float_scalar, float_array, elem_xpow) @@ -154,3 +156,5 @@ INSTALL_WIDENOP_TI (ti, octave_float_scalar, octave_float_matrix, matrix_conv); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-fs-fs.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-fs-fs.cc Mon Aug 16 21:38:22 2021 -0400 @@ -40,6 +40,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // scalar unary ops. DEFUNOP (not, float_scalar) @@ -171,3 +173,5 @@ INSTALL_ASSIGNCONV_TI (ti, octave_float_scalar, octave_null_sq_str, octave_float_matrix); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-i16-i16.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-i16-i16.cc Mon Aug 16 21:38:22 2021 -0400 @@ -96,6 +96,8 @@ #include "op-int.h" +OCTAVE_NAMESPACE_BEGIN + OCTAVE_INT_OPS (int16) OCTAVE_MS_INT_ASSIGN_OPS (mi8, int16_, int8_, int8_) @@ -159,3 +161,5 @@ OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int16, int64); OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int16, uint64); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-i32-i32.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-i32-i32.cc Mon Aug 16 21:38:22 2021 -0400 @@ -96,6 +96,8 @@ #include "op-int.h" +OCTAVE_NAMESPACE_BEGIN + OCTAVE_INT_OPS (int32) OCTAVE_MS_INT_ASSIGN_OPS (mi8, int32_, int8_, int8_) @@ -159,3 +161,5 @@ OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int32, int64); OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int32, uint64); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-i64-i64.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-i64-i64.cc Mon Aug 16 21:38:22 2021 -0400 @@ -96,6 +96,8 @@ #include "op-int.h" +OCTAVE_NAMESPACE_BEGIN + OCTAVE_INT_OPS (int64) OCTAVE_MS_INT_ASSIGN_OPS (mi8, int64_, int8_, int8_) @@ -159,3 +161,5 @@ OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int64, uint32); OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int64, uint64); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-i8-i8.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-i8-i8.cc Mon Aug 16 21:38:22 2021 -0400 @@ -96,6 +96,8 @@ #include "op-int.h" +OCTAVE_NAMESPACE_BEGIN + OCTAVE_INT_OPS (int8) OCTAVE_MS_INT_ASSIGN_OPS (mui8, int8_, uint8_, uint8_) @@ -159,3 +161,5 @@ OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int8, int64); OCTAVE_INSTALL_MIXED_INT_CMP_OPS (int8, uint64); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-int-concat.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-int-concat.cc Mon Aug 16 21:38:22 2021 -0400 @@ -50,6 +50,8 @@ #include "op-int.h" #include "ops.h" +OCTAVE_NAMESPACE_BEGIN + // Concatenation of mixed integer types: OCTAVE_CONCAT_FN2 (int8, int16) @@ -319,3 +321,5 @@ OCTAVE_INSTALL_CHAR_INT_CONCAT_FN (uint32); OCTAVE_INSTALL_CHAR_INT_CONCAT_FN (uint64); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-m-cm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-m-cm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -44,6 +44,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // matrix by complex matrix ops. DEFNDBINOP_OP (add, matrix, complex_matrix, array, complex_array, +) @@ -184,3 +186,5 @@ INSTALL_WIDENOP_TI (ti, octave_matrix, octave_complex_matrix, complex_matrix_conv); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-m-cs.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-m-cs.cc Mon Aug 16 21:38:22 2021 -0400 @@ -44,6 +44,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // matrix by complex scalar ops. DEFNDBINOP_OP (add, matrix, complex, array, complex, +) @@ -99,7 +101,7 @@ const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1); const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2); - return x_el_div (v2.complex_value (), v1.array_value ()); + return elem_xdiv (v2.complex_value (), v1.array_value ()); } DEFNDBINOP_FN (el_and, matrix, complex, array, complex, mx_el_and) @@ -136,3 +138,5 @@ INSTALL_ASSIGNCONV_TI (ti, octave_float_matrix, octave_complex, octave_float_complex_matrix); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-m-m.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-m-m.cc Mon Aug 16 21:38:22 2021 -0400 @@ -38,6 +38,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // matrix unary ops. DEFNDUNOP_OP (not, matrix, array, !) @@ -223,3 +225,5 @@ INSTALL_ASSIGNOP_TI (ti, op_el_div_eq, octave_matrix, octave_matrix, assign_el_div); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-m-s.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-m-s.cc Mon Aug 16 21:38:22 2021 -0400 @@ -38,6 +38,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // matrix by scalar ops. DEFNDBINOP_OP (add, matrix, scalar, array, scalar, +) @@ -93,7 +95,7 @@ const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1); const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2); - return x_el_div (v2.double_value (), v1.array_value ()); + return elem_xdiv (v2.double_value (), v1.array_value ()); } DEFNDBINOP_FN (el_and, matrix, scalar, array, scalar, mx_el_and) @@ -147,3 +149,5 @@ INSTALL_ASSIGNOP_TI (ti, op_mul_eq, octave_matrix, octave_scalar, assign_mul); INSTALL_ASSIGNOP_TI (ti, op_div_eq, octave_matrix, octave_scalar, assign_div); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-m-scm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-m-scm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -41,6 +41,8 @@ #include "smx-m-scm.h" #include "ov-cx-sparse.h" +OCTAVE_NAMESPACE_BEGIN + // matrix by sparse complex matrix ops. DEFBINOP_OP (add, matrix, sparse_complex_matrix, +) @@ -174,3 +176,5 @@ INSTALL_WIDENOP_TI (ti, octave_matrix, octave_sparse_complex_matrix, sparse_complex_matrix_conv); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-m-sm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-m-sm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -40,6 +40,8 @@ #include "smx-m-sm.h" #include "ov-re-sparse.h" +OCTAVE_NAMESPACE_BEGIN + // matrix by sparse matrix ops. DEFBINOP_OP (add, matrix, sparse_matrix, +) @@ -165,3 +167,5 @@ INSTALL_WIDENOP_TI (ti, octave_matrix, octave_sparse_matrix, sparse_matrix_conv); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-mi.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-mi.cc Mon Aug 16 21:38:22 2021 -0400 @@ -35,6 +35,8 @@ #include "ov-typeinfo.h" #include "ov.h" +OCTAVE_NAMESPACE_BEGIN + // Magic integer unary ops. Only + and - are allowed so that // expressions like // @@ -121,3 +123,5 @@ INSTALL_UNOP_TI (ti, op_uplus, octave_magic_int, signed_uplus); INSTALL_UNOP_TI (ti, op_uminus, octave_magic_int, signed_uminus); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-pm-pm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-pm-pm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -37,6 +37,8 @@ #include "ops.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + DEFUNOP (transpose, perm_matrix) { const octave_perm_matrix& v = dynamic_cast<const octave_perm_matrix&> (a); @@ -91,3 +93,5 @@ INSTALL_WIDENOP_TI (ti, octave_perm_matrix, octave_matrix, perm_matrix_to_matrix); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-pm-scm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-pm-scm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -36,6 +36,8 @@ #include "ov-perm.h" #include "ov-cx-sparse.h" +OCTAVE_NAMESPACE_BEGIN + // permutation matrix by sparse matrix ops DEFBINOP (mul_pm_scm, perm_matrix, sparse_complex_matrix) @@ -106,3 +108,5 @@ INSTALL_BINOP_TI (ti, op_div, octave_sparse_complex_matrix, octave_perm_matrix, div_scm_pm); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-pm-sm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-pm-sm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -36,6 +36,8 @@ #include "ov-perm.h" #include "ov-re-sparse.h" +OCTAVE_NAMESPACE_BEGIN + // permutation matrix by sparse matrix ops DEFBINOP (mul_pm_sm, perm_matrix, sparse_matrix) @@ -102,3 +104,5 @@ INSTALL_BINOP_TI (ti, op_div, octave_sparse_matrix, octave_perm_matrix, div_sm_pm); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-pm-template.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-pm-template.cc Mon Aug 16 21:38:22 2021 -0400 @@ -42,6 +42,8 @@ # define LDMATRIX LMATRIX #endif +OCTAVE_NAMESPACE_BEGIN + #define OCTAVE_LMATRIX CONCAT2(octave_, LMATRIX) #define OCTAVE_LDMATRIX CONCAT2(octave_, LDMATRIX) #define OCTAVE_RMATRIX CONCAT2(octave_, RMATRIX) @@ -97,3 +99,5 @@ INSTALL_ASSIGNCONV_TI (ti, OCTAVE_LMATRIX, octave_null_sq_str, OCTAVE_LDMATRIX); #endif } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-range.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-range.cc Mon Aug 16 21:38:22 2021 -0400 @@ -36,6 +36,8 @@ #include "ov-null-mat.h" #include "ops.h" +OCTAVE_NAMESPACE_BEGIN + // Allow +RNG_VAL to avoid conversion to array. DEFUNOP_OP (uplus, range, /* no-op */) @@ -63,3 +65,5 @@ INSTALL_WIDENOP_TI (ti, octave_range, octave_matrix, range_to_matrix); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-s-cm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-s-cm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -44,6 +44,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // scalar by complex matrix ops. DEFNDBINOP_OP (add, scalar, complex_matrix, scalar, complex_array, +) @@ -85,7 +87,7 @@ DEFNDCMPLXCMPOP_FN (ne, scalar, complex_matrix, scalar, complex_array, mx_el_ne) DEFNDBINOP_OP (el_mul, scalar, complex_matrix, scalar, complex_array, *) -DEFNDBINOP_FN (el_div, scalar, complex_matrix, scalar, complex_array, x_el_div) +DEFNDBINOP_FN (el_div, scalar, complex_matrix, scalar, complex_array, elem_xdiv) DEFNDBINOP_FN (el_pow, scalar, complex_matrix, scalar, complex_array, elem_xpow) DEFBINOP (el_ldiv, scalar, complex_matrix) @@ -142,3 +144,5 @@ INSTALL_WIDENOP_TI (ti, octave_scalar, octave_complex_matrix, complex_matrix_conv); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-s-cs.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-s-cs.cc Mon Aug 16 21:38:22 2021 -0400 @@ -39,6 +39,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // scalar by complex scalar ops. DEFBINOP_OP (add, scalar, complex, +) @@ -137,3 +139,5 @@ INSTALL_ASSIGNCONV_TI (ti, octave_float_scalar, octave_complex, octave_float_complex_matrix); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-s-m.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-s-m.cc Mon Aug 16 21:38:22 2021 -0400 @@ -38,6 +38,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // scalar by matrix ops. DEFNDBINOP_OP (add, scalar, matrix, scalar, array, +) @@ -77,7 +79,7 @@ DEFNDBINOP_FN (ne, scalar, matrix, scalar, array, mx_el_ne) DEFNDBINOP_OP (el_mul, scalar, matrix, scalar, array, *) -DEFNDBINOP_FN (el_div, scalar, matrix, scalar, array, x_el_div) +DEFNDBINOP_FN (el_div, scalar, matrix, scalar, array, elem_xdiv) DEFNDBINOP_FN (el_pow, scalar, matrix, scalar, array, elem_xpow) DEFBINOP (el_ldiv, scalar, matrix) @@ -130,3 +132,5 @@ INSTALL_WIDENOP_TI (ti, octave_scalar, octave_matrix, matrix_conv); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-s-s.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-s-s.cc Mon Aug 16 21:38:22 2021 -0400 @@ -41,6 +41,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // scalar unary ops. DEFUNOP (not, scalar) @@ -158,3 +160,5 @@ INSTALL_ASSIGNCONV_TI (ti, octave_scalar, octave_null_str, octave_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_scalar, octave_null_sq_str, octave_matrix); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-s-scm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-s-scm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -42,6 +42,8 @@ #include "ov-re-sparse.h" #include "ov-cx-sparse.h" +OCTAVE_NAMESPACE_BEGIN + // scalar by sparse complex matrix ops. DEFBINOP_OP (add, scalar, sparse_complex_matrix, +) @@ -163,3 +165,5 @@ INSTALL_WIDENOP_TI (ti, octave_scalar, octave_sparse_complex_matrix, sparse_complex_matrix_conv); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-s-sm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-s-sm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -38,6 +38,8 @@ #include "sparse-xdiv.h" #include "ov-re-sparse.h" +OCTAVE_NAMESPACE_BEGIN + // scalar by sparse matrix ops. DEFBINOP_OP (add, scalar, sparse_matrix, +) @@ -143,3 +145,5 @@ INSTALL_WIDENOP_TI (ti, octave_scalar, octave_sparse_matrix, sparse_matrix_conv); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-sbm-b.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-sbm-b.cc Mon Aug 16 21:38:22 2021 -0400 @@ -46,6 +46,8 @@ #include "ov-re-sparse.h" #include "ov-bool-sparse.h" +OCTAVE_NAMESPACE_BEGIN + // sparse bool matrix by bool ops. DEFBINOP_FN (ne, sparse_bool_matrix, bool, mx_el_ne) @@ -154,3 +156,5 @@ octave_uint64_scalar, conv_and_assign); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-sbm-bm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-sbm-bm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -51,6 +51,8 @@ #include "smx-bm-sbm.h" #include "smx-sbm-bm.h" +OCTAVE_NAMESPACE_BEGIN + // sparse bool matrix by bool matrix ops. DEFBINOP_FN (eq, sparse_bool_matrix, bool_matrix, mx_el_eq) @@ -181,3 +183,5 @@ octave_null_sq_str, null_assign); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-sbm-sbm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-sbm-sbm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -38,6 +38,8 @@ #include "ov-re-sparse.h" #include "ov-bool-sparse.h" +OCTAVE_NAMESPACE_BEGIN + // unary sparse bool matrix ops. DEFUNOP_OP (not, sparse_bool_matrix, !) @@ -107,3 +109,5 @@ INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_bool_matrix, octave_sparse_bool_matrix, assign); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-scm-cm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-scm-cm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -41,6 +41,8 @@ #include "smx-cm-scm.h" #include "ov-cx-sparse.h" +OCTAVE_NAMESPACE_BEGIN + // sparse complex matrix by complex matrix ops. DEFBINOP_OP (add, sparse_complex_matrix, complex_matrix, +) @@ -194,3 +196,5 @@ INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_complex_matrix, octave_float_complex_matrix, sgl_assign); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-scm-cs.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-scm-cs.cc Mon Aug 16 21:38:22 2021 -0400 @@ -40,6 +40,8 @@ #include "sparse-xdiv.h" #include "ov-cx-sparse.h" +OCTAVE_NAMESPACE_BEGIN + // sparse complex matrix by complex scalar ops. DEFBINOP_OP (add, sparse_complex_matrix, complex, +) @@ -170,3 +172,5 @@ INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_complex_matrix, octave_float_complex, sgl_assign); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-scm-m.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-scm-m.cc Mon Aug 16 21:38:22 2021 -0400 @@ -42,6 +42,8 @@ #include "smx-m-scm.h" #include "ov-cx-sparse.h" +OCTAVE_NAMESPACE_BEGIN + // sparse complex matrix by matrix ops. DEFBINOP_OP (add, sparse_complex_matrix, matrix, +) @@ -171,3 +173,5 @@ INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_complex_matrix, octave_float_matrix, sgl_assign); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-scm-s.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-scm-s.cc Mon Aug 16 21:38:22 2021 -0400 @@ -43,6 +43,8 @@ #include "ov-re-sparse.h" #include "ov-cx-sparse.h" +OCTAVE_NAMESPACE_BEGIN + // sparse complex matrix by scalar ops. DEFBINOP_OP (add, sparse_complex_matrix, scalar, +) @@ -173,3 +175,5 @@ INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_complex_matrix, octave_float_scalar, sgl_assign); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-scm-scm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-scm-scm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -42,6 +42,8 @@ #include "xdiv.h" #include "xpow.h" +OCTAVE_NAMESPACE_BEGIN + // unary sparse complex matrix ops. DEFUNOP_OP (not, sparse_complex_matrix, !) @@ -210,3 +212,5 @@ INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_complex_matrix, octave_null_sq_str, null_assign); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-scm-sm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-scm-sm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -39,6 +39,8 @@ #include "ov-re-sparse.h" #include "ov-cx-sparse.h" +OCTAVE_NAMESPACE_BEGIN + // sparse complex matrix by sparse matrix ops. DEFBINOP_OP (add, sparse_complex_matrix, sparse_matrix, +) @@ -173,3 +175,5 @@ INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_complex_matrix, octave_sparse_matrix, assign); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-sm-cm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-sm-cm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -41,6 +41,8 @@ #include "smx-cm-sm.h" #include "ov-re-sparse.h" +OCTAVE_NAMESPACE_BEGIN + // sparse matrix by complex matrix ops. DEFBINOP_OP (add, sparse_matrix, complex_matrix, +) @@ -181,3 +183,5 @@ INSTALL_WIDENOP_TI (ti, octave_sparse_matrix, octave_complex_matrix, sparse_complex_matrix_conv); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-sm-cs.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-sm-cs.cc Mon Aug 16 21:38:22 2021 -0400 @@ -42,6 +42,8 @@ #include "smx-sm-cs.h" #include "smx-cs-sm.h" +OCTAVE_NAMESPACE_BEGIN + // sparse matrix by scalar ops. DEFBINOP_OP (add, sparse_matrix, complex, +) @@ -153,3 +155,5 @@ INSTALL_ASSIGNCONV_TI (ti, octave_sparse_matrix, octave_float_complex, octave_sparse_complex_matrix); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-sm-m.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-sm-m.cc Mon Aug 16 21:38:22 2021 -0400 @@ -41,6 +41,8 @@ #include "smx-m-sm.h" #include "ov-re-sparse.h" +OCTAVE_NAMESPACE_BEGIN + // sparse matrix by matrix ops. DEFBINOP_OP (add, sparse_matrix, matrix, +) @@ -161,3 +163,5 @@ INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_matrix, octave_float_matrix, sgl_assign); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-sm-s.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-sm-s.cc Mon Aug 16 21:38:22 2021 -0400 @@ -39,6 +39,8 @@ #include "sparse-xdiv.h" #include "ov-re-sparse.h" +OCTAVE_NAMESPACE_BEGIN + // sparse matrix by scalar ops. DEFBINOP_OP (add, sparse_matrix, scalar, +) @@ -155,3 +157,5 @@ INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_matrix, octave_float_scalar, sgl_assign); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-sm-scm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-sm-scm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -39,6 +39,8 @@ #include "ov-re-sparse.h" #include "ov-cx-sparse.h" +OCTAVE_NAMESPACE_BEGIN + // sparse matrix by sparse complex matrix ops. DEFBINOP_OP (add, sparse_matrix, sparse_complex_matrix, +) @@ -182,3 +184,5 @@ INSTALL_WIDENOP_TI (ti, octave_sparse_matrix, octave_sparse_complex_matrix, sparse_complex_matrix_conv); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-sm-sm.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-sm-sm.cc Mon Aug 16 21:38:22 2021 -0400 @@ -38,6 +38,8 @@ #include "sparse-xdiv.h" #include "ov-re-sparse.h" +OCTAVE_NAMESPACE_BEGIN + // sparse matrix unary ops. DEFUNOP_OP (not, sparse_matrix, !) @@ -189,3 +191,5 @@ INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_matrix, octave_null_sq_str, null_assign); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-str-m.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-str-m.cc Mon Aug 16 21:38:22 2021 -0400 @@ -35,6 +35,8 @@ #include "ov-typeinfo.h" #include "ops.h" +OCTAVE_NAMESPACE_BEGIN + DEFASSIGNOP (assign, char_matrix_str, octave_matrix) { octave_char_matrix_str& v1 = dynamic_cast<octave_char_matrix_str&> (a1); @@ -67,3 +69,5 @@ INSTALL_CATOP_TI (ti, octave_matrix, octave_char_matrix_str, m_str); INSTALL_CATOP_TI (ti, octave_matrix, octave_char_matrix_sq_str, m_str); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-str-s.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-str-s.cc Mon Aug 16 21:38:22 2021 -0400 @@ -35,6 +35,8 @@ #include "ov-typeinfo.h" #include "ops.h" +OCTAVE_NAMESPACE_BEGIN + DEFASSIGNOP (assign, char_matrix_str, octave_scalar) { octave_char_matrix_str& v1 = dynamic_cast<octave_char_matrix_str&> (a1); @@ -67,3 +69,5 @@ INSTALL_CATOP_TI (ti, octave_scalar, octave_char_matrix_str, s_str); INSTALL_CATOP_TI (ti, octave_scalar, octave_char_matrix_sq_str, s_str); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-str-str.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-str-str.cc Mon Aug 16 21:38:22 2021 -0400 @@ -35,6 +35,8 @@ #include "ov-null-mat.h" #include "ops.h" +OCTAVE_NAMESPACE_BEGIN + // string unary ops. DEFUNOP (transpose, char_matrix_str) @@ -217,3 +219,5 @@ null_assign); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-struct.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-struct.cc Mon Aug 16 21:38:22 2021 -0400 @@ -35,6 +35,8 @@ #include "ov-typeinfo.h" #include "ops.h" +OCTAVE_NAMESPACE_BEGIN + // struct ops. DEFUNOP (transpose, struct) @@ -110,3 +112,5 @@ INSTALL_CATOP_TI (ti, octave_struct, octave_matrix, struct_matrix); INSTALL_CATOP_TI (ti, octave_matrix, octave_struct, matrix_struct); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-ui16-ui16.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-ui16-ui16.cc Mon Aug 16 21:38:22 2021 -0400 @@ -96,6 +96,8 @@ #include "op-int.h" +OCTAVE_NAMESPACE_BEGIN + OCTAVE_INT_OPS (uint16) OCTAVE_MS_INT_ASSIGN_OPS (mi8, uint16_, int8_, int8_) @@ -159,3 +161,5 @@ OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint16, int64); OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint16, uint64); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-ui32-ui32.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-ui32-ui32.cc Mon Aug 16 21:38:22 2021 -0400 @@ -96,6 +96,8 @@ #include "op-int.h" +OCTAVE_NAMESPACE_BEGIN + OCTAVE_INT_OPS (uint32) OCTAVE_MS_INT_ASSIGN_OPS (mi8, uint32_, int8_, int8_) @@ -158,3 +160,5 @@ OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint32, int64); OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint32, uint64); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-ui64-ui64.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-ui64-ui64.cc Mon Aug 16 21:38:22 2021 -0400 @@ -96,6 +96,8 @@ #include "op-int.h" +OCTAVE_NAMESPACE_BEGIN + OCTAVE_INT_OPS (uint64) OCTAVE_MS_INT_ASSIGN_OPS (mi8, uint64_, int8_, int8_) @@ -159,3 +161,5 @@ OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint64, uint32); OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint64, int64); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/op-ui8-ui8.cc Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/op-ui8-ui8.cc Mon Aug 16 21:38:22 2021 -0400 @@ -96,6 +96,8 @@ #include "op-int.h" +OCTAVE_NAMESPACE_BEGIN + OCTAVE_INT_OPS (uint8) OCTAVE_MS_INT_ASSIGN_OPS (mi8, uint8_, int8_, int8_) @@ -159,3 +161,5 @@ OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint8, int64); OCTAVE_INSTALL_MIXED_INT_CMP_OPS (uint8, uint64); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/operators/ops.h Mon Aug 16 19:46:07 2021 -0400 +++ b/libinterp/operators/ops.h Mon Aug 16 21:38:22 2021 -0400 @@ -42,8 +42,6 @@ #define CONCAT3X(x, y, z) x ## y ## z #define CONCAT3(x, y, z) CONCAT3X (x, y, z) -extern void install_ops (octave::type_info&); - #define INSTALL_UNOP_TI(ti, op, t, f) \ ti.install_unary_op \ (octave_value::op, t::static_type_id (), CONCAT2 (oct_unop_, f));