# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1435235541 14400
# Node ID 085c99b96aed1f46da04a32e25ff23fa63b09f78
# Parent  a0fab64685ab2e61db95ecd0c211b832daf9d34f# Parent  977853866d6969358ceb20421a54b736e3e26894
maint: Merge away extra head on default.

diff -r 977853866d69 -r 085c99b96aed liboctave/util/sparse-util.cc
--- a/liboctave/util/sparse-util.cc	Sat May 23 23:52:58 2015 -0500
+++ b/liboctave/util/sparse-util.cc	Thu Jun 25 08:32:21 2015 -0400
@@ -33,14 +33,14 @@
 
 // FIXME: this overload is here due to API change in SuiteSparse (3.1 -> 3.2)
 
-#ifdef HAVE_CHOLMOD
-
 void
 SparseCholError (int status, char *file, int line, char *message)
 {
   SparseCholError (status, file, line, message);
 }
 
+#ifdef HAVE_CHOLMOD
+
 void
 SparseCholError (int status, const char *file, int line, const char *message)
 {
@@ -53,6 +53,15 @@
        status, line, file, message);
 }
 
+#else
+
+void
+SparseCholError (int status, const char *, int, const char *)
+{
+}
+
+#endif //HAVE_CHOLMOD
+
 int
 SparseCholPrint (const char *fmt, ...)
 {
@@ -64,8 +73,6 @@
   return ret;
 }
 
-#endif //HAVE_CHOLMOD
-
 bool
 sparse_indices_ok (octave_idx_type *r, octave_idx_type *c,
                    octave_idx_type nrows, octave_idx_type ncols,
diff -r 977853866d69 -r 085c99b96aed liboctave/util/sparse-util.h
--- a/liboctave/util/sparse-util.h	Sat May 23 23:52:58 2015 -0500
+++ b/liboctave/util/sparse-util.h	Thu Jun 25 08:32:21 2015 -0400
@@ -24,16 +24,18 @@
 #if !defined (octave_sparse_util_h)
 #define octave_sparse_util_h 1
 
-#ifdef HAVE_CHOLMOD
+// The next two functions don't do anything unless CHOLMOD is
+// available
 
 // 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, ...);
+extern OCTAVE_API void
+SparseCholError (int status, char *file, int line, char *message);
 
-#endif //HAVE_CHOLMOD
+extern OCTAVE_API void
+SparseCholError (int status, const char *file, int line, const char *message);
+
+extern OCTAVE_API int
+SparseCholPrint (const char *fmt, ...);
 
 extern OCTAVE_API bool
 sparse_indices_ok (octave_idx_type *r, octave_idx_type *c,