Mercurial > jwe > octave

diff libinterp/dldfcn/dmperm.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 e06e600f396a
children 791dcb32b657
line wrap: on
line diff
--- a/libinterp/dldfcn/dmperm.cc	Fri Jan 29 11:32:23 2016 -0800
+++ b/libinterp/dldfcn/dmperm.cc	Fri Jan 29 14:55:20 2016 -0500
@@ -84,11 +84,7 @@
 
   if (nargout <= 1 || rank)
     {
-#if defined (CS_VER) && (CS_VER >= 2)
       octave_idx_type *jmatch = CXSPARSE_NAME (_maxtrans) (&csm, 0);
-#else
-      octave_idx_type *jmatch = CXSPARSE_NAME (_maxtrans) (&csm);
-#endif
       if (rank)
         {
           octave_idx_type r = 0;
@@ -103,21 +99,13 @@
     }
   else
     {
-#if defined (CS_VER) && (CS_VER >= 2)
       CXSPARSE_NAME (d) *dm = CXSPARSE_NAME(_dmperm) (&csm, 0);
-#else
-      CXSPARSE_NAME (d) *dm = CXSPARSE_NAME(_dmperm) (&csm);
-#endif
 
       //retval(5) = put_int (dm->rr, 5);
       //retval(4) = put_int (dm->cc, 5);
-#if defined (CS_VER) && (CS_VER >= 2)
       retval = ovl (put_int (dm->p, nr), put_int (dm->q, nc),
                     put_int (dm->r, dm->nb+1), put_int (dm->s, dm->nb+1));
-#else
-      retval = ovl (put_int (dm->P, nr), put_int (dm->Q, nc),
-                    put_int (dm->R, dm->nb+1), put_int (dm->S, dm->nb+1));
-#endif
+
       CXSPARSE_NAME (_dfree) (dm);
     }