changeset 11874:757ca614e918 release-3-0-x

fix for SuiteSparse 3.2
author Jaroslav Hajek <highegg@gmail.com>
date Sun, 12 Oct 2008 10:30:40 +0200
parents e0229beb02c9
children f53f57d2ee51
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
+++ b/liboctave/ChangeLog
@@ -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-08  John W. Eaton  <jwe@octave.org>
 
 	* Sparse-op-defs.h (SPARSE_SMSM_BOOL_OPS): Duplicate code for scalar
--- 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);
 
--- 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