Mercurial > jwe > octave

diff liboctave/util/oct-binmap.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 3ac9f47fb04b
children 1473547f50f5
line wrap: on
line diff
--- a/liboctave/util/oct-binmap.h	Sun Jan 24 10:11:43 2016 -0800
+++ b/liboctave/util/oct-binmap.h	Sun Jan 24 13:50:04 2016 -0500
@@ -60,7 +60,7 @@
 // The following template wrappers are provided for automatic bsxfun
 // calls (see the function signature for do_bsxfun_op).
 
-template<typename R, typename X, typename Y, typename F>
+template <typename R, typename X, typename Y, typename F>
 class bsxfun_wrapper
 {
 private:
@@ -96,12 +96,12 @@
 };
 
 // Static init
-template<typename R, typename X, typename Y, typename F>
+template <typename R, typename X, typename Y, typename F>
 F bsxfun_wrapper<R, X, Y, F>::f;
 
 
 // scalar-Array
-template <class U, class T, class R, class F>
+template <typename U, typename T, typename R, typename F>
 Array<U>
 binmap (const T& x, const Array<R>& ya, F fcn)
 {
@@ -132,7 +132,7 @@
 }
 
 // Array-scalar
-template <class U, class T, class R, class F>
+template <typename U, typename T, typename R, typename F>
 Array<U>
 binmap (const Array<T>& xa, const R& y, F fcn)
 {
@@ -163,7 +163,7 @@
 }
 
 // Array-Array (treats singletons as scalars)
-template <class U, class T, class R, class F>
+template <typename U, typename T, typename R, typename F>
 Array<U>
 binmap (const Array<T>& xa, const Array<R>& ya, F fcn, const char *name)
 {
@@ -213,7 +213,7 @@
 }
 
 // scalar-Sparse
-template <class U, class T, class R, class F>
+template <typename U, typename T, typename R, typename F>
 Sparse<U>
 binmap (const T& x, const Sparse<R>& ys, F fcn)
 {
@@ -244,7 +244,7 @@
 }
 
 // Sparse-scalar
-template <class U, class T, class R, class F>
+template <typename U, typename T, typename R, typename F>
 Sparse<U>
 binmap (const Sparse<T>& xs, const R& y, F fcn)
 {
@@ -275,7 +275,7 @@
 }
 
 // Sparse-Sparse (treats singletons as scalars)
-template <class U, class T, class R, class F>
+template <typename U, typename T, typename R, typename F>
 Sparse<U>
 binmap (const Sparse<T>& xs, const Sparse<R>& ys, F fcn, const char *name)
 {
@@ -354,136 +354,136 @@
 
 // Signature (T, R)
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Array<U>
 binmap (const Array<T>& xa, const Array<R>& ya, U (*fcn) (T, R),
         const char *name)
 { return binmap<U, T, R, U (*) (T, R)> (xa, ya, fcn, name); }
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Array<U>
 binmap (const T& x, const Array<R>& ya, U (*fcn) (T, R))
 { return binmap<U, T, R, U (*) (T, R)> (x, ya, fcn); }
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Array<U>
 binmap (const Array<T>& xa, const R& y, U (*fcn) (T, R))
 { return binmap<U, T, R, U (*) (T, R)> (xa, y, fcn); }
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Sparse<U>
 binmap (const Sparse<T>& xa, const Sparse<R>& ya, U (*fcn) (T, R),
         const char *name)
 { return binmap<U, T, R, U (*) (T, R)> (xa, ya, fcn, name); }
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Sparse<U>
 binmap (const T& x, const Sparse<R>& ya, U (*fcn) (T, R))
 { return binmap<U, T, R, U (*) (T, R)> (x, ya, fcn); }
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Sparse<U>
 binmap (const Sparse<T>& xa, const R& y, U (*fcn) (T, R))
 { return binmap<U, T, R, U (*) (T, R)> (xa, y, fcn); }
 
 // Signature (const T&, const R&)
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Array<U>
 binmap (const Array<T>& xa, const Array<R>& ya, U (*fcn) (const T&, const R&),
         const char *name)
 { return binmap<U, T, R, U (*) (const T&, const R&)> (xa, ya, fcn, name); }
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Array<U>
 binmap (const T& x, const Array<R>& ya, U (*fcn) (const T&, const R&))
 { return binmap<U, T, R, U (*) (const T&, const R&)> (x, ya, fcn); }
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Array<U>
 binmap (const Array<T>& xa, const R& y, U (*fcn) (const T&, const R&))
 { return binmap<U, T, R, U (*) (const T&, const R&)> (xa, y, fcn); }
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Sparse<U>
 binmap (const Sparse<T>& xa, const Sparse<R>& ya, U (*fcn) (const T&, const R&),
         const char *name)
 { return binmap<U, T, R, U (*) (const T&, const R&)> (xa, ya, fcn, name); }
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Sparse<U>
 binmap (const T& x, const Sparse<R>& ya, U (*fcn) (const T&, const R&))
 { return binmap<U, T, R, U (*) (const T&, const R&)> (x, ya, fcn); }
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Sparse<U>
 binmap (const Sparse<T>& xa, const R& y, U (*fcn) (const T&, const R&))
 { return binmap<U, T, R, U (*) (const T&, const R&)> (xa, y, fcn); }
 
 // Signature (const T&, R)
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Array<U>
 binmap (const Array<T>& xa, const Array<R>& ya, U (*fcn) (const T&, R),
         const char *name)
 { return binmap<U, T, R, U (*) (const T&, R)> (xa, ya, fcn, name); }
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Array<U>
 binmap (const T& x, const Array<R>& ya, U (*fcn) (const T&, R))
 { return binmap<U, T, R, U (*) (const T&, R)> (x, ya, fcn); }
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Array<U>
 binmap (const Array<T>& xa, const R& y, U (*fcn) (const T&, R))
 { return binmap<U, T, R, U (*) (const T&, R)> (xa, y, fcn); }
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Sparse<U>
 binmap (const Sparse<T>& xa, const Sparse<R>& ya, U (*fcn) (const T&, R),
         const char *name)
 { return binmap<U, T, R, U (*) (const T&, R)> (xa, ya, fcn, name); }
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Sparse<U>
 binmap (const T& x, const Sparse<R>& ya, U (*fcn) (const T&, R))
 { return binmap<U, T, R, U (*) (const T&, R)> (x, ya, fcn); }
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Sparse<U>
 binmap (const Sparse<T>& xa, const R& y, U (*fcn) (const T&, R))
 { return binmap<U, T, R, U (*) (const T&, R)> (xa, y, fcn); }
 
 // Signature (T, const R&)
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Array<U>
 binmap (const Array<T>& xa, const Array<R>& ya, U (*fcn) (T, const R&),
         const char *name)
 { return binmap<U, T, R, U (*) (T, const R&)> (xa, ya, fcn, name); }
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Array<U>
 binmap (const T& x, const Array<R>& ya, U (*fcn) (T, const R&))
 { return binmap<U, T, R, U (*) (T, const R&)> (x, ya, fcn); }
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Array<U>
 binmap (const Array<T>& xa, const R& y, U (*fcn) (T, const R&))
 { return binmap<U, T, R, U (*) (T, const R&)> (xa, y, fcn); }
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Sparse<U>
 binmap (const Sparse<T>& xa, const Sparse<R>& ya, U (*fcn) (T, const R&),
         const char *name)
 { return binmap<U, T, R, U (*) (T, const R&)> (xa, ya, fcn, name); }
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Sparse<U>
 binmap (const T& x, const Sparse<R>& ya, U (*fcn) (T, const R&))
 { return binmap<U, T, R, U (*) (T, const R&)> (x, ya, fcn); }
 
-template <class U, class T, class R>
+template <typename U, typename T, typename R>
 inline Sparse<U>
 binmap (const Sparse<T>& xa, const R& y, U (*fcn) (T, const R&))
 { return binmap<U, T, R, U (*) (T, const R&)> (xa, y, fcn); }