Mercurial > octave-nkf
changeset 11528:feb90c7cfc16
Build successfully without HAVE_CXSPARSE
| author | David Grundberg <individ@acc.umu.se> |
|---|---|
| date | Fri, 14 Jan 2011 21:04:02 +0100 |
| parents | a10544c699f2 |
| children | f98f925d8e5c |
| files | liboctave/ChangeLog liboctave/SparseCmplxQR.cc liboctave/SparseQR.cc |
| diffstat | 3 files changed, 16 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog Fri Jan 14 11:54:39 2011 -0800 +++ b/liboctave/ChangeLog Fri Jan 14 21:04:02 2011 +0100 @@ -1,3 +1,11 @@ +2011-01-14 David Grundberg <individ@acc.umu.se> + + * SparseQR.cc (SparseQR_rep::SparseQR_rep) [HAVE_CXSPARSE]: + Make initialization list depend on macro. Fixes compile error when + macro isn't defined. + * SparseCmplxQR.cc (SparseComplexQR_rep::SparseComplexQR_rep) + [HAVE_CXSPARSE]: Ditto. + 2011-01-14 John W. Eaton <jwe@octave.org> * lo-mappers.cc (xfloor): Move function body here from
--- a/liboctave/SparseCmplxQR.cc Fri Jan 14 11:54:39 2011 -0800 +++ b/liboctave/SparseCmplxQR.cc Fri Jan 14 21:04:02 2011 +0100 @@ -50,7 +50,10 @@ SparseComplexQR::SparseComplexQR_rep::SparseComplexQR_rep (GCC_ATTR_UNUSED const SparseComplexMatrix& a, GCC_ATTR_UNUSED int order) - : count (1), nrows (0), S (0), N (0) + : count (1), nrows (0) +#ifdef HAVE_CXSPARSE + , S (0), N (0) +#endif { #ifdef HAVE_CXSPARSE CXSPARSE_ZNAME () A;
--- a/liboctave/SparseQR.cc Fri Jan 14 11:54:39 2011 -0800 +++ b/liboctave/SparseQR.cc Fri Jan 14 21:04:02 2011 +0100 @@ -30,7 +30,10 @@ #include "oct-locbuf.h" SparseQR::SparseQR_rep::SparseQR_rep (const SparseMatrix& a, int order) - : count (1), nrows (0), S (0), N (0) + : count (1), nrows (0) +#ifdef HAVE_CXSPARSE + , S (0), N (0) +#endif { #ifdef HAVE_CXSPARSE CXSPARSE_DNAME () A;