Mercurial > octave
diff libinterp/corefcn/gsvd.cc @ 29961:7d6709900da7
eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
Files affected: __betainc__.cc, __contourc__.cc, __eigs__.cc,
__expint__.cc, __ftp__.cc, __gammainc__.cc, __ichol__.cc, __ilu__.cc,
__magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, amd.cc, balance.cc,
besselj.cc, bsxfun.cc, call-stack.cc, ccolamd.cc, cellfun.cc, chol.cc,
colamd.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc,
defaults.cc, dirfns.cc, display.cc, dlmread.cc, dmperm.cc, dot.cc,
eig.cc, ellipj.cc, environment.cc, error.cc, event-manager.cc, fft.cc,
fft2.cc, fftn.cc, file-io.cc, find.cc, gcd.cc, getgrent.cc,
getpwent.cc, getrusage.cc, gsvd.cc, hash.cc, help.cc, hess.cc,
hex2num.cc, input.cc, inv.cc, jsondecode.cc, jsonencode.cc,
load-path.cc, load-save.cc, lookup.cc, lsode.cc, lu.cc, max.cc,
mgorth.cc, oct-hist.cc, ordqz.cc, ordschur.cc, pager.cc, pr-output.cc,
psi.cc, qr.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, regexp.cc,
schur.cc, settings.cc, sighandlers.cc, sparse.cc, spparms.cc,
sqrtm.cc, stream-euler.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc,
symbfact.cc, symtab.cc, syscalls.cc, sysdep.cc, time.cc, toplev.cc,
tril.cc, typecast.cc, urlwrite.cc, utils.cc, variables.cc,
__delaunayn__.cc, __fltk_uigetfile__.cc, __glpk__.cc,
__init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audiodevinfo.cc,
audioread.cc, convhulln.cc, fftw.cc, gzip.cc, ov-cell.cc, ov-class.cc,
ov-classdef.cc, ov-fcn-handle.cc, ov-struct.cc, ov-typeinfo.cc,
ov-usr-fcn.cc, octave.cc, lex.ll, oct-parse.yy, profiler.cc,
andpt-eval.cc.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 14 Aug 2021 22:48:52 -0400 |
| parents | 32c3a5805893 |
| children | 4ee01c14fccd |
line wrap: on
line diff
--- a/libinterp/corefcn/gsvd.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/gsvd.cc Sat Aug 14 22:48:52 2021 -0400 @@ -43,13 +43,13 @@ OCTAVE_NAMESPACE_BEGIN template <typename T> -static typename octave::math::gsvd<T>::Type +static typename math::gsvd<T>::Type gsvd_type (int nargout) { return ((nargout == 0 || nargout == 1) - ? octave::math::gsvd<T>::Type::sigma_only - : (nargout > 5) ? octave::math::gsvd<T>::Type::std - : octave::math::gsvd<T>::Type::economy); + ? math::gsvd<T>::Type::sigma_only + : (nargout > 5) ? math::gsvd<T>::Type::std + : math::gsvd<T>::Type::economy); } // Named like this to avoid conflicts with the gsvd class. @@ -58,7 +58,7 @@ do_gsvd (const T& A, const T& B, const octave_idx_type nargout, bool is_single = false) { - octave::math::gsvd<T> result (A, B, gsvd_type<T> (nargout)); + math::gsvd<T> result (A, B, gsvd_type<T> (nargout)); octave_value_list retval (nargout); if (nargout < 2) @@ -182,29 +182,29 @@ { if (argA.is_single_type () || argB.is_single_type ()) { - retval(0) = octave::float_identity_matrix (nc, nc); - retval(1) = octave::float_identity_matrix (nc, nc); + retval(0) = float_identity_matrix (nc, nc); + retval(1) = float_identity_matrix (nc, nc); if (nargout > 2) - retval(2) = octave::float_identity_matrix (nr, nr); + retval(2) = float_identity_matrix (nr, nr); if (nargout > 3) retval(3) = FloatMatrix (nr, nc); if (nargout > 4) - retval(4) = octave::float_identity_matrix (nr, nr); + retval(4) = float_identity_matrix (nr, nr); if (nargout > 5) - retval(5) = octave::float_identity_matrix (nr, nr); + retval(5) = float_identity_matrix (nr, nr); } else { - retval(0) = octave::identity_matrix (nc, nc); - retval(1) = octave::identity_matrix (nc, nc); + retval(0) = identity_matrix (nc, nc); + retval(1) = identity_matrix (nc, nc); if (nargout > 2) - retval(2) = octave::identity_matrix (nr, nr); + retval(2) = identity_matrix (nr, nr); if (nargout > 3) retval(3) = Matrix (nr, nc); if (nargout > 4) - retval(4) = octave::identity_matrix (nr, nr); + retval(4) = identity_matrix (nr, nr); if (nargout > 5) - retval(5) = octave::identity_matrix (nr, nr); + retval(5) = identity_matrix (nr, nr); } } }