Mercurial > jwe > octave
diff liboctave/util/lo-traits.h @ 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 | f7084eae3318 |
| children | 1473547f50f5 |
line wrap: on
line diff
--- a/liboctave/util/lo-traits.h Sun Jan 24 10:11:43 2016 -0800 +++ b/liboctave/util/lo-traits.h Sun Jan 24 13:50:04 2016 -0500 @@ -32,7 +32,7 @@ template <bool cond, typename T1, typename T2> class if_then_else; -template<typename T1, typename T2> +template <typename T1, typename T2> class if_then_else<true, T1, T2> { public: @@ -40,7 +40,7 @@ typedef T1 result; }; -template<typename T1, typename T2> +template <typename T1, typename T2> class if_then_else<false, T1, T2> { public: @@ -49,7 +49,7 @@ }; // Determine whether two types are equal. -template <class T1, class T2> +template <typename T1, typename T2> class equal_types { public: @@ -57,7 +57,7 @@ static const bool value = false; }; -template <class T> +template <typename T> class equal_types <T, T> { public: @@ -67,7 +67,7 @@ // Determine whether a type is an instance of a template. -template <template <class> class Template, class T> +template <template <typename> class Template, typename T> class is_instance { public: @@ -75,7 +75,7 @@ static const bool value = false; }; -template <template <class> class Template, class T> +template <template <typename> class Template, typename T> class is_instance <Template, Template<T> > { public: @@ -85,7 +85,7 @@ // Determine whether a template paramter is a class type. -template<typename T1> +template <typename T1> class is_class_type { private: @@ -94,10 +94,10 @@ typedef struct { char c[2]; } two; // Classes can have pointers to members. - template<typename T2> static one is_class_type_test (int T2::*); + template <typename T2> static one is_class_type_test (int T2::*); // Catch everything else. - template<typename T2> static two is_class_type_test (...); + template <typename T2> static two is_class_type_test (...); public: @@ -108,7 +108,7 @@ // Define typename ref_param<T>::type as T const& if T is a class // type. Otherwise, define it to be T. -template<typename T> +template <typename T> class ref_param { public: @@ -119,14 +119,14 @@ // Will turn TemplatedClass<T> to T, leave T otherwise. // Useful for stripping wrapper classes, like octave_int. -template<template<typename> class TemplatedClass, typename T> +template <template <typename> class TemplatedClass, typename T> class strip_template_param { public: typedef T type; }; -template<template<typename> class TemplatedClass, typename T> +template <template <typename> class TemplatedClass, typename T> class strip_template_param<TemplatedClass, TemplatedClass<T> > { public: @@ -136,14 +136,14 @@ // Will turn TemplatedClass<T> to TemplatedClass<S>, T to S otherwise. // Useful for generic promotions. -template<template<typename> class TemplatedClass, typename T, typename S> +template <template <typename> class TemplatedClass, typename T, typename S> class subst_template_param { public: typedef S type; }; -template<template<typename> class TemplatedClass, typename T, typename S> +template <template <typename> class TemplatedClass, typename T, typename S> class subst_template_param<TemplatedClass, TemplatedClass<T>, S> { public: