# HG changeset patch # User John W. Eaton # Date 1296242517 18000 # Node ID 81e9ff0cc729d2fb7ce9817227324aaa7fd8f263 # Parent 3f162dd0c112d1164b36ea312c580ca70f3e7fd2 eigs-base.cc: fix error in change removing HAVE_ARPACK diff -r 3f162dd0c112 -r 81e9ff0cc729 liboctave/ChangeLog --- a/liboctave/ChangeLog Fri Jan 28 19:50:08 2011 -0500 +++ b/liboctave/ChangeLog Fri Jan 28 14:21:57 2011 -0500 @@ -1,3 +1,8 @@ +2011-01-28 John W. Eaton + + * 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 * eigs-base.cc (EigsRealNonSymmetricFunc, diff -r 3f162dd0c112 -r 81e9ff0cc729 liboctave/eigs-base.cc --- a/liboctave/eigs-base.cc Fri Jan 28 19:50:08 2011 -0500 +++ b/liboctave/eigs-base.cc Fri Jan 28 14:21:57 2011 -0500 @@ -201,6 +201,8 @@ static Matrix utsolve (const Matrix&, const ColumnVector&, const Matrix&); +#endif + template 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