Mercurial > jwe > octave

diff liboctave/numeric/sparse-dmsolve.cc @ 21152:8ad3907b8fad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
require CXSparse 2.2 or later * oct-sparse.h: Require CXSparse 2.2 or later. * dmperm.cc, SparseCmplxQR.cc, SparseQR.cc, sparse-dmsolve.cc: Assume CXSparse 2.2 or later.
author John W. Eaton <jwe@octave.org>
date Fri, 29 Jan 2016 14:55:20 -0500
parents 7962dbca527f
children 791dcb32b657
line wrap: on
line diff
--- a/liboctave/numeric/sparse-dmsolve.cc	Fri Jan 29 11:32:23 2016 -0800
+++ b/liboctave/numeric/sparse-dmsolve.cc	Fri Jan 29 14:55:20 2016 -0500
@@ -322,15 +322,10 @@
       csm.p = const_cast<octave_idx_type *>(a.cidx ());
       csm.i = const_cast<octave_idx_type *>(a.ridx ());
 
-#if defined (CS_VER) && (CS_VER >= 2)
       CXSPARSE_DNAME (d) *dm = CXSPARSE_DNAME(_dmperm) (&csm, 0);
       octave_idx_type *p = dm->p;
       octave_idx_type *q = dm->q;
-#else
-      CXSPARSE_DNAME (d) *dm = CXSPARSE_DNAME(_dmperm) (&csm);
-      octave_idx_type *p = dm->P;
-      octave_idx_type *q = dm->Q;
-#endif
+
       OCTAVE_LOCAL_BUFFER (octave_idx_type, pinv, nr);
       for (octave_idx_type i = 0; i < nr; i++)
         pinv[p[i]] = i;