# HG changeset patch # User Jaroslav Hajek # Date 1223649861 -7200 # Node ID 60b4c75287a13ed3a16e414c466802c2549ba93c # Parent 0168d22e6bba2c24342079e49cc65a9a3afef693 fix for SuiteSparse 3.2 diff --git a/liboctave/ChangeLog b/liboctave/ChangeLog --- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,9 @@ +2008-10-10 Jaroslav Hajek + + * sparse-util.h (SparseCholPrint): Change char * argument to const + char *. + * sparse-util.cc (SparseCholPrint): Likewise. + 2008-10-09 Jaroslav Hajek * oct-sort.cc (octave_sort::merge_getmem, diff --git a/liboctave/sparse-util.cc b/liboctave/sparse-util.cc --- a/liboctave/sparse-util.cc +++ b/liboctave/sparse-util.cc @@ -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); diff --git a/liboctave/sparse-util.h b/liboctave/sparse-util.h --- a/liboctave/sparse-util.h +++ b/liboctave/sparse-util.h @@ -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