Mercurial > jwe > octave
comparison liboctave/array/idx-vector.cc @ 21139:538b57866b90
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 | 7cac4e7458f2 |
| children | f7121e111991 |
comparison
equal
deleted
inserted
replaced
| 21138:e2fca7d79169 | 21139:538b57866b90 |
|---|---|
| 229 convert_index (float x, bool& conv_error, octave_idx_type& ext) | 229 convert_index (float x, bool& conv_error, octave_idx_type& ext) |
| 230 { | 230 { |
| 231 return convert_index (static_cast<double> (x), conv_error, ext); | 231 return convert_index (static_cast<double> (x), conv_error, ext); |
| 232 } | 232 } |
| 233 | 233 |
| 234 template <class T> | 234 template <typename T> |
| 235 inline octave_idx_type | 235 inline octave_idx_type |
| 236 convert_index (octave_int<T> x, bool& conv_error, | 236 convert_index (octave_int<T> x, bool& conv_error, |
| 237 octave_idx_type& ext) | 237 octave_idx_type& ext) |
| 238 { | 238 { |
| 239 octave_idx_type i = octave_int<octave_idx_type> (x).value (); | 239 octave_idx_type i = octave_int<octave_idx_type> (x).value (); |
| 240 | 240 |
| 241 return convert_index (i, conv_error, ext); | 241 return convert_index (i, conv_error, ext); |
| 242 } | 242 } |
| 243 | 243 |
| 244 | 244 |
| 245 template <class T> | 245 template <typename T> |
| 246 idx_vector::idx_scalar_rep::idx_scalar_rep (T x) | 246 idx_vector::idx_scalar_rep::idx_scalar_rep (T x) |
| 247 : data (0) | 247 : data (0) |
| 248 { | 248 { |
| 249 octave_idx_type dummy = 0; | 249 octave_idx_type dummy = 0; |
| 250 | 250 |
| 292 { | 292 { |
| 293 return Array<octave_idx_type> (dim_vector (1, 1), data); | 293 return Array<octave_idx_type> (dim_vector (1, 1), data); |
| 294 } | 294 } |
| 295 | 295 |
| 296 | 296 |
| 297 template <class T> | 297 template <typename T> |
| 298 idx_vector::idx_vector_rep::idx_vector_rep (const Array<T>& nda) | 298 idx_vector::idx_vector_rep::idx_vector_rep (const Array<T>& nda) |
| 299 : data (0), len (nda.numel ()), ext (0), aowner (0), orig_dims (nda.dims ()) | 299 : data (0), len (nda.numel ()), ext (0), aowner (0), orig_dims (nda.dims ()) |
| 300 { | 300 { |
| 301 if (len != 0) | 301 if (len != 0) |
| 302 { | 302 { |