Mercurial > hg > octave-nkf
comparison liboctave/util/sparse-util.h @ 20493:a0fab64685ab
Avoid HAVE_ macro in header file.
* sparse-util.h, sparse-util.cc (SparseCholError, SparseCholPrint):
Unconditionally declare and define functions.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 24 Jun 2015 17:32:36 -0400 |
parents | 4197fc428c7d |
children |
comparison
equal
deleted
inserted
replaced
20491:5db7eea18d76 | 20493:a0fab64685ab |
---|---|
22 */ | 22 */ |
23 | 23 |
24 #if !defined (octave_sparse_util_h) | 24 #if !defined (octave_sparse_util_h) |
25 #define octave_sparse_util_h 1 | 25 #define octave_sparse_util_h 1 |
26 | 26 |
27 #ifdef HAVE_CHOLMOD | 27 // The next two functions don't do anything unless CHOLMOD is |
28 // available | |
28 | 29 |
29 // FIXME this overload is here due to API change in SuiteSparse (3.1 -> 3.2) | 30 // FIXME this overload is here due to API change in SuiteSparse (3.1 -> 3.2) |
30 extern OCTAVE_API void SparseCholError (int status, char *file, | 31 extern OCTAVE_API void |
31 int line, char *message); | 32 SparseCholError (int status, char *file, int line, char *message); |
32 extern OCTAVE_API void SparseCholError (int status, const char *file, | |
33 int line, const char *message); | |
34 extern OCTAVE_API int SparseCholPrint (const char *fmt, ...); | |
35 | 33 |
36 #endif //HAVE_CHOLMOD | 34 extern OCTAVE_API void |
35 SparseCholError (int status, const char *file, int line, const char *message); | |
36 | |
37 extern OCTAVE_API int | |
38 SparseCholPrint (const char *fmt, ...); | |
37 | 39 |
38 extern OCTAVE_API bool | 40 extern OCTAVE_API bool |
39 sparse_indices_ok (octave_idx_type *r, octave_idx_type *c, | 41 sparse_indices_ok (octave_idx_type *r, octave_idx_type *c, |
40 octave_idx_type nrows, octave_idx_type ncols, | 42 octave_idx_type nrows, octave_idx_type ncols, |
41 octave_idx_type nnz); | 43 octave_idx_type nnz); |