Mercurial > jwe > octave

comparison libinterp/corefcn/bsxfun.cc @ 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 529593df22fa
children fcac5dbbf9ed
comparison
equal deleted inserted replaced
21138:e2fca7d79169 21139:538b57866b90
93 const octave_value&); 93 const octave_value&);
94 94
95 // Static table of handlers. 95 // Static table of handlers.
96 bsxfun_handler bsxfun_handler_table[bsxfun_num_builtin_ops][btyp_num_types]; 96 bsxfun_handler bsxfun_handler_table[bsxfun_num_builtin_ops][btyp_num_types];
97 97
98 template <class NDA, NDA (bsxfun_op) (const NDA&, const NDA&)> 98 template <typename NDA, NDA (bsxfun_op) (const NDA&, const NDA&)>
99 static octave_value 99 static octave_value
100 bsxfun_forward_op (const octave_value& x, const octave_value& y) 100 bsxfun_forward_op (const octave_value& x, const octave_value& y)
101 { 101 {
102 NDA xa = octave_value_extract<NDA> (x); 102 NDA xa = octave_value_extract<NDA> (x);
103 NDA ya = octave_value_extract<NDA> (y); 103 NDA ya = octave_value_extract<NDA> (y);
104 return octave_value (bsxfun_op (xa, ya)); 104 return octave_value (bsxfun_op (xa, ya));
105 } 105 }
106 106
107 template <class NDA, boolNDArray (bsxfun_rel) (const NDA&, const NDA&)> 107 template <typename NDA, boolNDArray (bsxfun_rel) (const NDA&, const NDA&)>
108 static octave_value 108 static octave_value
109 bsxfun_forward_rel (const octave_value& x, const octave_value& y) 109 bsxfun_forward_rel (const octave_value& x, const octave_value& y)
110 { 110 {
111 NDA xa = octave_value_extract<NDA> (x); 111 NDA xa = octave_value_extract<NDA> (x);
112 NDA ya = octave_value_extract<NDA> (y); 112 NDA ya = octave_value_extract<NDA> (y);
113 return octave_value (bsxfun_rel (xa, ya)); 113 return octave_value (bsxfun_rel (xa, ya));
114 } 114 }
115 115
116 // pow() needs a special handler for reals 116 // pow() needs a special handler for reals
117 // because of the potentially complex result. 117 // because of the potentially complex result.
118 template <class NDA, class CNDA> 118 template <typename NDA, typename CNDA>
119 static octave_value 119 static octave_value
120 do_bsxfun_real_pow (const octave_value& x, const octave_value& y) 120 do_bsxfun_real_pow (const octave_value& x, const octave_value& y)
121 { 121 {
122 NDA xa = octave_value_extract<NDA> (x); 122 NDA xa = octave_value_extract<NDA> (x);
123 NDA ya = octave_value_extract<NDA> (y); 123 NDA ya = octave_value_extract<NDA> (y);