Mercurial > octave-antonio
comparison liboctave/util/oct-sparse.h @ 19139:afd6179d2616
allow building with new version of SuiteSparse (bug #43063)
* oct-sparse.h (SUITESPARSE_ASSIGN_FPTR, SUITESPARSE_ASSIGN_FPTR2):
New macros.
* amd.cc, symbfact.cc, CSparse.cc, dSparse.cc, sparse-base-chol.cc:
Use as needed.
From Andre da Costa Barros <andre.cbarros@yahoo.com>.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sun, 21 Sep 2014 15:45:08 -0400 |
parents | ebb3ef964372 |
children | 4d460b124be3 |
comparison
equal
deleted
inserted
replaced
19138:ebeb3defae37 | 19139:afd6179d2616 |
---|---|
92 #else | 92 #else |
93 #define CHOLMOD_NAME(name) cholmod_ ## name | 93 #define CHOLMOD_NAME(name) cholmod_ ## name |
94 #endif | 94 #endif |
95 #endif | 95 #endif |
96 | 96 |
97 // Cope with new suitesparse versions | |
98 // | |
99 #if defined (SUITESPARSE_VERSION) && SUITESPARSE_VERSION >= SUITESPARSE_VER_CODE (4, 3) | |
100 # define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) (SuiteSparse_config.f_name = f_assign) | |
101 # define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (SuiteSparse_config.f_name = CHOLMOD_NAME (f_assign)) | |
102 #else | |
103 # define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) (f_var = f_assign) | |
104 # define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (f_var = CHOLMOD_NAME (f_assign)) | |
97 #endif | 105 #endif |
106 | |
107 #endif |