Mercurial > jwe > octave

comparison libinterp/octave-value/ov.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 2e5c1f766ac9
children 1473547f50f5
comparison
equal deleted inserted replaced
21138:e2fca7d79169 21139:538b57866b90
1537 OV_COMP_BINOP_FN (op_mul_herm) 1537 OV_COMP_BINOP_FN (op_mul_herm)
1538 1538
1539 extern OCTINTERP_API void install_types (void); 1539 extern OCTINTERP_API void install_types (void);
1540 1540
1541 // Templated value extractors. 1541 // Templated value extractors.
1542 template<class Value> 1542 template <typename Value>
1543 inline Value octave_value_extract (const octave_value&) 1543 inline Value octave_value_extract (const octave_value&)
1544 { assert (false); } 1544 { assert (false); }
1545 1545
1546 #define DEF_VALUE_EXTRACTOR(VALUE,MPREFIX) \ 1546 #define DEF_VALUE_EXTRACTOR(VALUE,MPREFIX) \
1547 template<> \ 1547 template <> \
1548 inline VALUE octave_value_extract<VALUE> (const octave_value& v) \ 1548 inline VALUE octave_value_extract<VALUE> (const octave_value& v) \
1549 { return v.MPREFIX ## _value (); } 1549 { return v.MPREFIX ## _value (); }
1550 1550
1551 DEF_VALUE_EXTRACTOR (double, scalar) 1551 DEF_VALUE_EXTRACTOR (double, scalar)
1552 DEF_VALUE_EXTRACTOR (float, float_scalar) 1552 DEF_VALUE_EXTRACTOR (float, float_scalar)
1606 DEF_VALUE_EXTRACTOR (SparseComplexMatrix, sparse_complex_matrix) 1606 DEF_VALUE_EXTRACTOR (SparseComplexMatrix, sparse_complex_matrix)
1607 DEF_VALUE_EXTRACTOR (SparseBoolMatrix, sparse_bool_matrix) 1607 DEF_VALUE_EXTRACTOR (SparseBoolMatrix, sparse_bool_matrix)
1608 #undef DEF_VALUE_EXTRACTOR 1608 #undef DEF_VALUE_EXTRACTOR
1609 1609
1610 #define DEF_DUMMY_VALUE_EXTRACTOR(VALUE,DEFVAL) \ 1610 #define DEF_DUMMY_VALUE_EXTRACTOR(VALUE,DEFVAL) \
1611 template<> \ 1611 template <> \
1612 inline VALUE octave_value_extract<VALUE> (const octave_value&) \ 1612 inline VALUE octave_value_extract<VALUE> (const octave_value&) \
1613 { assert (false); return DEFVAL; } 1613 { assert (false); return DEFVAL; }
1614 1614
1615 DEF_DUMMY_VALUE_EXTRACTOR (char, 0) 1615 DEF_DUMMY_VALUE_EXTRACTOR (char, 0)
1616 DEF_DUMMY_VALUE_EXTRACTOR (octave_value, octave_value ()) 1616 DEF_DUMMY_VALUE_EXTRACTOR (octave_value, octave_value ())