Mercurial > octave

changeset 21210:4f7d3989c462

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move UMFPACK_DNAME and UMFPACK_ZNAME macros to oct-sparse.h * oct-sparse.h: Define internal UMFPACK_DNAME and UMFPACK_ZNAME macros here instead of in the CSparse.h and dSparse.h public header files.
author John W. Eaton <jwe@octave.org>
date Sat, 06 Feb 2016 07:43:32 -0500
parents 67d2965af0b5
children 2cf8bc5c7017
files liboctave/array/CSparse.h liboctave/array/dSparse.h liboctave/util/oct-sparse.h
diffstat 3 files changed, 10 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/array/CSparse.h	Sat Feb 06 08:15:53 2016 -0500
+++ b/liboctave/array/CSparse.h	Sat Feb 06 07:43:32 2016 -0500
@@ -549,10 +549,4 @@
 
 SPARSE_FORWARD_DEFS (MSparse, SparseComplexMatrix, ComplexMatrix, Complex)
 
-#if defined (ENABLE_64)
-#  define UMFPACK_ZNAME(name) umfpack_zl_ ## name
-#else
-#  define UMFPACK_ZNAME(name) umfpack_zi_ ## name
 #endif
-
-#endif
--- a/liboctave/array/dSparse.h	Sat Feb 06 08:15:53 2016 -0500
+++ b/liboctave/array/dSparse.h	Sat Feb 06 07:43:32 2016 -0500
@@ -506,10 +506,4 @@
 
 SPARSE_FORWARD_DEFS (MSparse, SparseMatrix, Matrix, double)
 
-#if defined (ENABLE_64)
-#  define UMFPACK_DNAME(name) umfpack_dl_ ## name
-#else
-#  define UMFPACK_DNAME(name) umfpack_di_ ## name
 #endif
-
-#endif
--- a/liboctave/util/oct-sparse.h	Sat Feb 06 08:15:53 2016 -0500
+++ b/liboctave/util/oct-sparse.h	Sat Feb 06 07:43:32 2016 -0500
@@ -117,4 +117,14 @@
 #  endif
 #endif
 
+#if defined (HAVE_UMFPACK)
+#  if defined (ENABLE_64)
+#    define UMFPACK_DNAME(name) umfpack_dl_ ## name
+#    define UMFPACK_ZNAME(name) umfpack_zl_ ## name
+#  else
+#    define UMFPACK_DNAME(name) umfpack_di_ ## name
+#    define UMFPACK_ZNAME(name) umfpack_zi_ ## name
+#  endif
 #endif
+
+#endif