Mercurial > jwe > octave

comparison liboctave/numeric/sparse-base-chol.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 7cac4e7458f2
children e06e600f396a
comparison
equal deleted inserted replaced
21138:e2fca7d79169 21139:538b57866b90
33 #include "quit.h" 33 #include "quit.h"
34 #include "MatrixType.h" 34 #include "MatrixType.h"
35 35
36 #ifdef HAVE_CHOLMOD 36 #ifdef HAVE_CHOLMOD
37 // Can't use CHOLMOD_NAME(drop)(0.0, S, cm). It doesn't treat complex matrices 37 // Can't use CHOLMOD_NAME(drop)(0.0, S, cm). It doesn't treat complex matrices
38 template <class chol_type, class chol_elt, class p_type> 38 template <typename chol_type, typename chol_elt, typename p_type>
39 void 39 void
40 sparse_base_chol<chol_type, chol_elt, p_type>::sparse_base_chol_rep::drop_zeros 40 sparse_base_chol<chol_type, chol_elt, p_type>::sparse_base_chol_rep::drop_zeros
41 (const cholmod_sparse* S) 41 (const cholmod_sparse* S)
42 { 42 {
43 chol_elt sik; 43 chol_elt sik;
75 } 75 }
76 Sp[ncol] = pdest; 76 Sp[ncol] = pdest;
77 } 77 }
78 #endif 78 #endif
79 79
80 template <class chol_type, class chol_elt, class p_type> 80 template <typename chol_type, typename chol_elt, typename p_type>
81 octave_idx_type 81 octave_idx_type
82 sparse_base_chol<chol_type, chol_elt, p_type>::sparse_base_chol_rep::init 82 sparse_base_chol<chol_type, chol_elt, p_type>::sparse_base_chol_rep::init
83 (const chol_type& a, bool natural, bool force) 83 (const chol_type& a, bool natural, bool force)
84 { 84 {
85 volatile octave_idx_type info = 0; 85 volatile octave_idx_type info = 0;
216 (*current_liboctave_error_handler) 216 (*current_liboctave_error_handler)
217 ("support for CHOLMOD was unavailable or disabled when liboctave was built"); 217 ("support for CHOLMOD was unavailable or disabled when liboctave was built");
218 #endif 218 #endif
219 } 219 }
220 220
221 template <class chol_type, class chol_elt, class p_type> 221 template <typename chol_type, typename chol_elt, typename p_type>
222 chol_type 222 chol_type
223 sparse_base_chol<chol_type, chol_elt, p_type>::L (void) const 223 sparse_base_chol<chol_type, chol_elt, p_type>::L (void) const
224 { 224 {
225 #ifdef HAVE_CHOLMOD 225 #ifdef HAVE_CHOLMOD
226 cholmod_sparse *m = rep->L (); 226 cholmod_sparse *m = rep->L ();
238 #else 238 #else
239 return chol_type (); 239 return chol_type ();
240 #endif 240 #endif
241 } 241 }
242 242
243 template <class chol_type, class chol_elt, class p_type> 243 template <typename chol_type, typename chol_elt, typename p_type>
244 p_type 244 p_type
245 sparse_base_chol<chol_type, chol_elt, p_type>:: 245 sparse_base_chol<chol_type, chol_elt, p_type>::
246 sparse_base_chol_rep::Q (void) const 246 sparse_base_chol_rep::Q (void) const
247 { 247 {
248 #ifdef HAVE_CHOLMOD 248 #ifdef HAVE_CHOLMOD
261 #else 261 #else
262 return p_type (); 262 return p_type ();
263 #endif 263 #endif
264 } 264 }
265 265
266 template <class chol_type, class chol_elt, class p_type> 266 template <typename chol_type, typename chol_elt, typename p_type>
267 chol_type 267 chol_type
268 sparse_base_chol<chol_type, chol_elt, p_type>::inverse (void) const 268 sparse_base_chol<chol_type, chol_elt, p_type>::inverse (void) const
269 { 269 {
270 chol_type retval; 270 chol_type retval;
271 #ifdef HAVE_CHOLMOD 271 #ifdef HAVE_CHOLMOD