Mercurial > octave
diff 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 |
line wrap: on
line diff
--- a/liboctave/util/oct-sparse.h Sun Sep 21 15:42:09 2014 -0400 +++ b/liboctave/util/oct-sparse.h Sun Sep 21 15:45:08 2014 -0400 @@ -94,4 +94,14 @@ #endif #endif +// Cope with new suitesparse versions +// +#if defined (SUITESPARSE_VERSION) && SUITESPARSE_VERSION >= SUITESPARSE_VER_CODE (4, 3) +# 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)) +#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)) #endif + +#endif