Mercurial > jwe > octave

comparison liboctave/array/MDiagArray2.h @ 21139:538b57866b90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
consistently use "typename" intead of "class" in template declarations * Object.h, QtHandlesUtils.cc, QtHandlesUtils.h, ToolBarButton.cc, ToolBarButton.h, Cell.h, __lin_interpn__.cc, bitfcns.cc, bsxfun.cc, cellfun.cc, data.cc, filter.cc, gcd.cc, graphics.cc, help.cc, kron.cc, lookup.cc, ls-mat5.cc, ls-oct-text.h, lu.cc, max.cc, mgorth.cc, oct-map.cc, oct-map.h, oct-stream.cc, oct-stream.h, octave-link.h, pr-output.cc, profiler.h, schur.cc, sparse-xdiv.cc, sparse-xpow.cc, sqrtm.cc, symtab.h, tril.cc, typecast.cc, variables.cc, xdiv.cc, zfstream.h, __init_fltk__.cc, __magick_read__.cc, chol.cc, qr.cc, ov-base-diag.cc, ov-base-diag.h, ov-base-int.cc, ov-base-int.h, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base-scalar.h, ov-base-sparse.cc, ov-base-sparse.h, ov-base.h, ov-classdef.cc, ov-int-traits.h, ov-java.h, ov-usr-fcn.h, ov.cc, ov.h, op-dms-template.cc, oct-parse.in.yy, parse.h, pt-mat.cc, Array-b.cc, Array.cc, Array.h, CDiagMatrix.h, CMatrix.h, CNDArray.h, DiagArray2.cc, DiagArray2.h, MArray.cc, MArray.h, MDiagArray2.cc, MDiagArray2.h, MSparse.cc, MSparse.h, MatrixType.cc, Sparse.cc, Sparse.h, dDiagMatrix.h, dMatrix.h, dNDArray.h, fCDiagMatrix.h, fCMatrix.h, fCNDArray.h, fDiagMatrix.h, fMatrix.h, fNDArray.h, idx-vector.cc, idx-vector.h, intNDArray.cc, intNDArray.h, DET.h, base-aepbal.h, base-lu.cc, base-lu.h, base-qr.cc, base-qr.h, bsxfun-defs.cc, eigs-base.cc, lo-mappers.h, lo-specfun.cc, lo-specfun.h, oct-convn.cc, oct-fftw.cc, oct-norm.cc, sparse-base-chol.cc, sparse-base-chol.h, sparse-base-lu.cc, sparse-base-lu.h, sparse-dmsolve.cc, mx-inlines.cc, action-container.h, base-list.h, lo-traits.h, lo-utils.h, oct-base64.h, oct-binmap.h, oct-cmplx.h, oct-inttypes.cc, oct-inttypes.h, oct-locbuf.h, oct-refcount.h, oct-sort.cc, oct-sort.h: Use "typename" instead of "class" in template declarations.
author John W. Eaton <jwe@octave.org>
date Sun, 24 Jan 2016 13:50:04 -0500
parents 2a99b8b250cd
children 1473547f50f5
comparison
equal deleted inserted replaced
21138:e2fca7d79169 21139:538b57866b90
26 #define octave_MDiagArray2_h 1 26 #define octave_MDiagArray2_h 1
27 27
28 #include "DiagArray2.h" 28 #include "DiagArray2.h"
29 #include "MArray.h" 29 #include "MArray.h"
30 30
31 template <class T> class MDiagArray2; 31 template <typename T> class MDiagArray2;
32 32
33 template <typename T> MDiagArray2<T> operator + (const MDiagArray2<T>&); 33 template <typename T> MDiagArray2<T> operator + (const MDiagArray2<T>&);
34 template <typename T> MDiagArray2<T> operator - (const MDiagArray2<T>&); 34 template <typename T> MDiagArray2<T> operator - (const MDiagArray2<T>&);
35 template <typename T> MDiagArray2<T> operator * (const MDiagArray2<T>&, 35 template <typename T> MDiagArray2<T> operator * (const MDiagArray2<T>&,
36 const T&); 36 const T&);
44 const MDiagArray2<T>&); 44 const MDiagArray2<T>&);
45 template <typename T> MDiagArray2<T> product (const MDiagArray2<T>&, 45 template <typename T> MDiagArray2<T> product (const MDiagArray2<T>&,
46 const MDiagArray2<T>&); 46 const MDiagArray2<T>&);
47 47
48 //! Template for two dimensional diagonal array with math operators. 48 //! Template for two dimensional diagonal array with math operators.
49 template <class T> 49 template <typename T>
50 class 50 class
51 MDiagArray2 : public DiagArray2<T> 51 MDiagArray2 : public DiagArray2<T>
52 { 52 {
53 public: 53 public:
54 54
61 61
62 MDiagArray2 (const MDiagArray2<T>& a) : DiagArray2<T> (a) { } 62 MDiagArray2 (const MDiagArray2<T>& a) : DiagArray2<T> (a) { }
63 63
64 MDiagArray2 (const DiagArray2<T>& a) : DiagArray2<T> (a) { } 64 MDiagArray2 (const DiagArray2<T>& a) : DiagArray2<T> (a) { }
65 65
66 template <class U> 66 template <typename U>
67 MDiagArray2 (const DiagArray2<U>& a) : DiagArray2<T> (a) { } 67 MDiagArray2 (const DiagArray2<U>& a) : DiagArray2<T> (a) { }
68 68
69 explicit MDiagArray2 (const Array<T>& a) : DiagArray2<T> (a) { } 69 explicit MDiagArray2 (const Array<T>& a) : DiagArray2<T> (a) { }
70 70
71 MDiagArray2 (const Array<T>& a, octave_idx_type r, octave_idx_type c) 71 MDiagArray2 (const Array<T>& a, octave_idx_type r, octave_idx_type c)