Mercurial > octave-nkf

changeset 19790:cdcdb255c46d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix cholmod initialization with SuiteSparse >= 4.3 (bug #44285) * oct-sparse.h (SUITESPARSE_NAME): New macro. (SUITESPARSE_ASSIGN_FPTR2): Use it when initializing divcomplex and hypot for SuiteSparse >= 4.3.
author Mike Miller <mtmiller@ieee.org>
date Wed, 18 Feb 2015 22:35:04 -0500
parents 5fec783ffc6d
children 3266c382b328
files liboctave/util/oct-sparse.h
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/util/oct-sparse.h	Wed Feb 18 18:56:51 2015 -0800
+++ b/liboctave/util/oct-sparse.h	Wed Feb 18 22:35:04 2015 -0500
@@ -98,8 +98,9 @@
 //
 #if defined (SUITESPARSE_VERSION)
 # if SUITESPARSE_VERSION >= SUITESPARSE_VER_CODE (4, 3)
+#  define SUITESPARSE_NAME(name) SuiteSparse_ ## name
 #  define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) (SuiteSparse_config.f_name = f_assign)
-#  define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (SuiteSparse_config.f_name = CHOLMOD_NAME (f_assign))
+#  define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (SuiteSparse_config.f_name = SUITESPARSE_NAME (f_assign))
 # else
 #  define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) (f_var = f_assign)
 #  define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (f_var = CHOLMOD_NAME (f_assign))