Mercurial > hg > octave-shane
changeset 12282:81e9ff0cc729 release-3-4-x
eigs-base.cc: fix error in change removing HAVE_ARPACK
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 28 Jan 2011 14:21:57 -0500 |
parents | 3f162dd0c112 |
children | 0664a7ddd944 |
files | liboctave/ChangeLog liboctave/eigs-base.cc |
diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,8 @@ +2011-01-28 John W. Eaton <jwe@octave.org> + + * eigs-base.cc: Remove #endif corresponding to "#ifdef HAVE_ARPACK", + not the one that matched "#if !defined (CXX_NEW_FRIEND_TEMPLATE_DECL)". + 2011-01-28 John W. Eaton <jwe@octave.org> * eigs-base.cc (EigsRealNonSymmetricFunc,
--- a/liboctave/eigs-base.cc +++ b/liboctave/eigs-base.cc @@ -201,6 +201,8 @@ static Matrix utsolve (const Matrix&, const ColumnVector&, const Matrix&); +#endif + template <class M, class SM> static octave_idx_type lusolve (const SM& L, const SM& U, M& m) @@ -3827,7 +3829,6 @@ ComplexColumnVector &resid, std::ostream& os, double tol = DBL_EPSILON, bool rvec = false, bool cholB = 0, int disp = 0, int maxit = 300); -#endif #ifndef _MSC_VER template static octave_idx_type