Mercurial > octave

diff liboctave/util/oct-inttypes.cc @ 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 f7e416862e90
children f7121e111991
line wrap: on
line diff
--- a/liboctave/util/oct-inttypes.cc	Sun Jan 24 10:11:43 2016 -0800
+++ b/liboctave/util/oct-inttypes.cc	Sun Jan 24 13:50:04 2016 -0500
@@ -31,10 +31,10 @@
 
 #include "oct-inttypes.h"
 
-template<class T>
+template <typename T>
 const octave_int<T> octave_int<T>::zero (static_cast<T> (0));
 
-template<class T>
+template <typename T>
 const octave_int<T> octave_int<T>::one (static_cast<T> (1));
 
 // define type names.
@@ -57,7 +57,7 @@
 #ifdef OCTAVE_ENSURE_LONG_DOUBLE_OPERATIONS_ARE_NOT_TRUNCATED
 
 #define DEFINE_OCTAVE_LONG_DOUBLE_CMP_OP_TEMPLATES(T) \
-  template <class xop> \
+  template <typename xop> \
   bool \
   octave_int_cmp_op::external_mop (double x, T y) \
   { \
@@ -73,7 +73,7 @@
      return retval; \
   } \
    \
-  template <class xop> \
+  template <typename xop> \
   bool \
   octave_int_cmp_op::external_mop (T x, double y) \
   { \
@@ -189,7 +189,7 @@
 
 // Define comparison operators
 
-template <class xop>
+template <typename xop>
 bool
 octave_int_cmp_op::emulate_mop (uint64_t x, double y)
 {
@@ -209,7 +209,7 @@
     }
 }
 
-template <class xop>
+template <typename xop>
 bool
 octave_int_cmp_op::emulate_mop (int64_t x, double y)
 {
@@ -236,7 +236,7 @@
 // We define double-int operations by reverting the operator
 
 // A trait class reverting the operator
-template <class xop>
+template <typename xop>
 class rev_op
 {
 public:
@@ -256,7 +256,7 @@
 DEFINE_REVERTED_OPERATOR(le,ge);
 DEFINE_REVERTED_OPERATOR(ge,le);
 
-template <class xop>
+template <typename xop>
 bool
 octave_int_cmp_op::emulate_mop (double x, uint64_t y)
 {
@@ -264,7 +264,7 @@
   return mop<rop> (y, x);
 }
 
-template <class xop>
+template <typename xop>
 bool
 octave_int_cmp_op::emulate_mop (double x, int64_t y)
 {
@@ -663,14 +663,7 @@
 
 #endif
 
-//template <class T>
-//bool
-//xisnan (const octave_int<T>&)
-//{
-//  return false;
-//}
-
-template <class T>
+template <typename T>
 octave_int<T>
 pow (const octave_int<T>& a, const octave_int<T>& b)
 {
@@ -712,12 +705,12 @@
   return retval;
 }
 
-template <class T>
+template <typename T>
 octave_int<T>
 pow (const double& a, const octave_int<T>& b)
 { return octave_int<T> (pow (a, b.double_value ())); }
 
-template <class T>
+template <typename T>
 octave_int<T>
 pow (const octave_int<T>& a, const double& b)
 {
@@ -726,12 +719,12 @@
           : octave_int<T> (pow (a.double_value (), b)));
 }
 
-template <class T>
+template <typename T>
 octave_int<T>
 pow (const float& a, const octave_int<T>& b)
 { return octave_int<T> (pow (a, b.float_value ())); }
 
-template <class T>
+template <typename T>
 octave_int<T>
 pow (const octave_int<T>& a, const float& b)
 {
@@ -743,12 +736,12 @@
 // FIXME: Do we really need a differently named single-precision
 //        function integer power function here instead of an overloaded
 //        one?
-template <class T>
+template <typename T>
 octave_int<T>
 powf (const float& a, const octave_int<T>& b)
 { return octave_int<T> (pow (a, b.float_value ())); }
 
-template <class T>
+template <typename T>
 octave_int<T>
 powf (const octave_int<T>& a, const float& b)
 {