Mercurial > octave-nkf
changeset 8207:60b4c75287a1
fix for SuiteSparse 3.2
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Fri, 10 Oct 2008 16:44:21 +0200 |
| parents | 0168d22e6bba |
| children | f6ca8ff51818 |
| files | liboctave/ChangeLog liboctave/sparse-util.cc liboctave/sparse-util.h |
| diffstat | 3 files changed, 18 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog Fri Oct 10 08:02:24 2008 +0200 +++ b/liboctave/ChangeLog Fri Oct 10 16:44:21 2008 +0200 @@ -1,3 +1,9 @@ +2008-10-10 Jaroslav Hajek <highegg@gmail.com> + + * sparse-util.h (SparseCholPrint): Change char * argument to const + char *. + * sparse-util.cc (SparseCholPrint): Likewise. + 2008-10-09 Jaroslav Hajek <highegg@gmail.com> * oct-sort.cc (octave_sort<T>::merge_getmem,
--- a/liboctave/sparse-util.cc Fri Oct 10 08:02:24 2008 +0200 +++ b/liboctave/sparse-util.cc Fri Oct 10 16:44:21 2008 +0200 @@ -30,9 +30,16 @@ #include "lo-error.h" #include "sparse-util.h" +// FIXME this overload is here due to API change in SuiteSparse (3.1 -> 3.2) void SparseCholError (int status, char *file, int line, char *message) { + SparseCholError (status, file, line, message); +} + +void +SparseCholError (int status, const char *file, int line, const char *message) +{ (*current_liboctave_warning_handler)("warning %i, at line %i in file %s", status, line, file);
--- a/liboctave/sparse-util.h Fri Oct 10 08:02:24 2008 +0200 +++ b/liboctave/sparse-util.h Fri Oct 10 16:44:21 2008 +0200 @@ -24,7 +24,11 @@ #if !defined (octave_sparse_util_h) #define octave_sparse_util_h 1 -extern OCTAVE_API void SparseCholError (int status, char *file, int line, char *message); +// FIXME this overload is here due to API change in SuiteSparse (3.1 -> 3.2) +extern OCTAVE_API void SparseCholError (int status, char *file, + int line, char *message); +extern OCTAVE_API void SparseCholError (int status, const char *file, + int line, const char *message); extern OCTAVE_API int SparseCholPrint (const char *fmt, ...); #endif