Mercurial > jwe > octave
diff libinterp/octave-value/ov-base-int.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 | 95f8c8cdbffe |
| children | fcac5dbbf9ed |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-base-int.cc Sun Jan 24 10:11:43 2016 -0800 +++ b/libinterp/octave-value/ov-base-int.cc Sun Jan 24 13:50:04 2016 -0500 @@ -61,7 +61,7 @@ // about comparisons always false due to limited range of data types. // Ugh. The cure may be worse than the disease. -template <class T, bool is_signed = true, bool can_be_too_big = true> +template <typename T, bool is_signed = true, bool can_be_too_big = true> struct octave_base_int_helper { static bool @@ -71,13 +71,13 @@ } }; -template <class T> +template <typename T> struct octave_base_int_helper<T, false, false> { static bool char_value_out_of_range (T) { return false; } }; -template <class T> +template <typename T> struct octave_base_int_helper<T, false, true> { static bool char_value_out_of_range (T val) @@ -86,7 +86,7 @@ } }; -template <class T> +template <typename T> struct octave_base_int_helper<T, true, false> { static bool char_value_out_of_range (T val) { return val < 0; } @@ -98,7 +98,7 @@ // are still OK, but will see the warnings again for any other types // that do not meet this assumption. -template <class T> +template <typename T> struct octave_base_int_helper_traits { static const bool can_be_larger_than_uchar_max = true; @@ -123,7 +123,7 @@ }; -template <class T> +template <typename T> octave_base_value * octave_base_int_matrix<T>::try_narrowing_conversion (void) { @@ -136,7 +136,7 @@ return retval; } -template <class T> +template <typename T> octave_value octave_base_int_matrix<T>::convert_to_str_internal (bool, bool, char type) const { @@ -184,7 +184,7 @@ return retval; } -template <class T> +template <typename T> bool octave_base_int_matrix<T>::save_ascii (std::ostream& os) { @@ -200,7 +200,7 @@ return true; } -template <class T> +template <typename T> bool octave_base_int_matrix<T>::load_ascii (std::istream& is) { @@ -230,7 +230,7 @@ return true; } -template <class T> +template <typename T> bool octave_base_int_matrix<T>::save_binary (std::ostream& os, bool&) { @@ -253,7 +253,7 @@ return true; } -template <class T> +template <typename T> bool octave_base_int_matrix<T>::load_binary (std::istream& is, bool swap, oct_mach_info::float_format) @@ -323,7 +323,7 @@ return true; } -template <class T> +template <typename T> bool octave_base_int_matrix<T>::save_hdf5 (octave_hdf5_id loc_id, const char *name, bool) { @@ -375,7 +375,7 @@ return retval; } -template <class T> +template <typename T> bool octave_base_int_matrix<T>::load_hdf5 (octave_hdf5_id loc_id, const char *name) { @@ -444,7 +444,7 @@ return retval; } -template <class T> +template <typename T> void octave_base_int_matrix<T>::print_raw (std::ostream& os, bool pr_as_read_syntax) const @@ -453,7 +453,7 @@ this->current_print_indent_level ()); } -template <class T> +template <typename T> octave_value octave_base_int_scalar<T>::convert_to_str_internal (bool, bool, char type) const { @@ -484,7 +484,7 @@ return retval; } -template <class T> +template <typename T> bool octave_base_int_scalar<T>::save_ascii (std::ostream& os) { @@ -492,7 +492,7 @@ return true; } -template <class T> +template <typename T> bool octave_base_int_scalar<T>::load_ascii (std::istream& is) { @@ -503,7 +503,7 @@ return true; } -template <class T> +template <typename T> bool octave_base_int_scalar<T>::save_binary (std::ostream& os, bool&) { @@ -511,7 +511,7 @@ return true; } -template <class T> +template <typename T> bool octave_base_int_scalar<T>::load_binary (std::istream& is, bool swap, oct_mach_info::float_format) @@ -540,7 +540,7 @@ return true; } -template <class T> +template <typename T> bool octave_base_int_scalar<T>::save_hdf5 (octave_hdf5_id loc_id, const char *name, bool) { @@ -582,7 +582,7 @@ return retval; } -template <class T> +template <typename T> bool octave_base_int_scalar<T>::load_hdf5 (octave_hdf5_id loc_id, const char *name) {