[arpack++] 04/04: * Team upload * Standards-Version updated to 3.9.5 * Fix the URL (Closes: #702546) * libarpack++2-dev recommends libsuperlu3-dev (Closes: #726568) * Fix 'gcc-4.7 build errors (missing this pointers)' (Closes: #684805) * debian/rules - add "-fi" option to fix "required file './test-driver' not found (Closes: #713300)
Anton Gladky
gladk at moszumanska.debian.org
Wed Sep 10 16:38:24 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository arpack++.
commit b400fa13151aa33128233b25eced2d9080477b34
Author: sylvestre <sylvestre at 7ca82aff-d165-4cda-a4f1-7f280d66a853>
Date: Mon Nov 4 17:10:31 2013 +0000
* Team upload
* Standards-Version updated to 3.9.5
* Fix the URL (Closes: #702546)
* libarpack++2-dev recommends libsuperlu3-dev (Closes: #726568)
* Fix 'gcc-4.7 build errors (missing this pointers)' (Closes: #684805)
* debian/rules
- add "-fi" option to fix "required file './test-driver' not found
(Closes: #713300)
git-svn-id: svn+ssh://svn.debian.org/svn/debian-science/packages/arpack++@46357 7ca82aff-d165-4cda-a4f1-7f280d66a853
---
trunk/debian/README.debian | 8 +-
trunk/debian/changelog | 15 +
trunk/debian/control | 5 +-
trunk/debian/patches/fix-build-error.diff | 922 ++++++++++++++++++++++++++++++
trunk/debian/patches/series | 1 +
trunk/debian/rules | 5 +-
6 files changed, 947 insertions(+), 9 deletions(-)
diff --git a/trunk/debian/README.debian b/trunk/debian/README.debian
index 84355e0..db61b7a 100644
--- a/trunk/debian/README.debian
+++ b/trunk/debian/README.debian
@@ -1,8 +1,10 @@
Arpack++ for Debian
----------------------
-Arpack++ was downloaded on Mon, 4 Feb 2002 19:50:51 -0500. Since then I have
-applied numerous patches to update arpack++ to standard c++ code and make compile
-on recent g++ versions.
+Arpack++ was downloaded on Mon, 4 Feb 2002 19:50:51 -0500. Since then I have
+applied numerous patches to update arpack++ to standard c++ code and make compile on recent g++ versions.
+
+To compile using arpack++, the command line arguments should be used:
+-lblas -lgfortran -lgfortranbegin -lnsl -larpack -larpack++
Christophe Prud'homme <prudhomm at mit.edu>, Mon, 4 Feb 2002 19:50:51 -0500
diff --git a/trunk/debian/changelog b/trunk/debian/changelog
index d980855..8193a08 100644
--- a/trunk/debian/changelog
+++ b/trunk/debian/changelog
@@ -1,3 +1,18 @@
+arpack++ (2.3-2.1) UNRELEASED; urgency=low
+
+ * Team upload
+ * Standards-Version updated to 3.9.5
+ * Fix the URL (Closes: #702546)
+ * libarpack++2-dev recommends libsuperlu3-dev (Closes: #726568)
+ * Fix 'gcc-4.7 build errors (missing this pointers)' (Closes: #684805)
+
+ [ Hideki Yamane ]
+ * debian/rules
+ - add "-fi" option to fix "required file './test-driver' not found
+ (Closes: #713300)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 04 Nov 2013 17:38:44 +0100
+
arpack++ (2.3-2) unstable; urgency=low
* Team upload
diff --git a/trunk/debian/control b/trunk/debian/control
index 7347ca9..464fd7e 100644
--- a/trunk/debian/control
+++ b/trunk/debian/control
@@ -1,11 +1,11 @@
Source: arpack++
-Homepage: http://ljk.imag.fr/membres/Christophe.Prudhomme/software.php
+Homepage: http://www.caam.rice.edu/software/ARPACK/arpack++.html
Section: devel
Priority: optional
Build-Depends: cdbs, debhelper ( >> 4.1.0 ), gfortran, libblas-dev, liblapack-dev, libarpack2-dev, chrpath, automake, autoconf, libtool
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Christophe Prud'homme <prudhomm at debian.org>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.5
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/arpack++/
Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/arpack++/
@@ -31,6 +31,7 @@ Package: libarpack++2-dev
Section: libdevel
Architecture: any
Depends: libarpack++2c2a (= ${binary:Version}), libarpack2-dev, ${misc:Depends}
+Recommends: libsuperlu3-dev
Description: Object-oriented version of the ARPACK package (development)
ARPACK++ is an object-oriented version of the ARPACK package. It consists a
collection of classes that offers c++ programmers an interface to ARPACK. It
diff --git a/trunk/debian/patches/fix-build-error.diff b/trunk/debian/patches/fix-build-error.diff
new file mode 100644
index 0000000..5dec7fc
--- /dev/null
+++ b/trunk/debian/patches/fix-build-error.diff
@@ -0,0 +1,922 @@
+Index: arpack++-2.3/include/arbgcomp.h
+===================================================================
+--- arpack++-2.3.orig/include/arbgcomp.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arbgcomp.h 2013-11-04 17:46:33.000000000 +0100
+@@ -156,7 +156,7 @@
+
+ Pencil.DefineMatrices(A, B);
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARbdNonSymPencil<arcomplex<ARFLOAT>, ARFLOAT>::MultInvBAv,
+ &Pencil,
+ &ARbdNonSymPencil<arcomplex<ARFLOAT>, ARFLOAT>::MultBv,
+@@ -176,7 +176,7 @@
+ {
+
+ Pencil.DefineMatrices(A, B);
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARbdNonSymPencil<arcomplex<ARFLOAT>, ARFLOAT>::MultInvAsBv,
+ &Pencil,
+ &ARbdNonSymPencil<arcomplex<ARFLOAT>,ARFLOAT>::MultBv,
+Index: arpack++-2.3/include/arbgnsym.h
+===================================================================
+--- arpack++-2.3.orig/include/arbgnsym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arbgnsym.h 2013-11-04 17:46:51.000000000 +0100
+@@ -179,7 +179,7 @@
+
+ Pencil.DefineMatrices(A, B);
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARbdNonSymPencil<ARFLOAT, ARFLOAT>::MultInvBAv, &Pencil,
+ &ARbdNonSymPencil<ARFLOAT, ARFLOAT>::MultBv, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+@@ -197,7 +197,7 @@
+ {
+
+ Pencil.DefineMatrices(A, B);
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARbdNonSymPencil<ARFLOAT, ARFLOAT>::MultInvAsBv, &Pencil,
+ &ARbdNonSymPencil<ARFLOAT, ARFLOAT>::MultBv, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+@@ -216,7 +216,7 @@
+ {
+
+ Pencil.DefineMatrices(A, B);
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARbdNonSymPencil<ARFLOAT, ARFLOAT>::MultInvAsBv, &Pencil,
+ &ARbdNonSymPencil<ARFLOAT, ARFLOAT>::MultBv, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+Index: arpack++-2.3/include/arbgsym.h
+===================================================================
+--- arpack++-2.3.orig/include/arbgsym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arbgsym.h 2013-11-04 17:47:09.000000000 +0100
+@@ -179,7 +179,7 @@
+ Pencil.DefineMatrices(A, B);
+ this->InvertMode = 'S';
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARbdSymPencil<ARFLOAT>::MultInvBAv, &Pencil,
+ &ARbdSymPencil<ARFLOAT>::MultBv, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+@@ -197,7 +197,7 @@
+ {
+
+ Pencil.DefineMatrices(A, B);
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARbdSymPencil<ARFLOAT>::MultInvAsBv, &Pencil,
+ &ARbdSymPencil<ARFLOAT>::MultBv, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+Index: arpack++-2.3/include/arbscomp.h
+===================================================================
+--- arpack++-2.3.orig/include/arbscomp.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arbscomp.h 2013-11-04 17:47:29.000000000 +0100
+@@ -123,7 +123,7 @@
+ {
+
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &A,
++ this->DefineParameters(A.ncols(), nevp, &A,
+ &ARbdNonSymMatrix<arcomplex<ARFLOAT>, ARFLOAT>::MultMv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+@@ -139,10 +139,10 @@
+
+ {
+
+- DefineParameters(A.ncols(), nevp, &A,
++ this->DefineParameters(A.ncols(), nevp, &A,
+ &ARbdNonSymMatrix<arcomplex<ARFLOAT>, ARFLOAT>::MultInvv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+- ChangeShift(sigmap);
++ this->ChangeShift(sigmap);
+
+ } // Long constructor (shift and invert mode).
+
+Index: arpack++-2.3/include/arbsnsym.h
+===================================================================
+--- arpack++-2.3.orig/include/arbsnsym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arbsnsym.h 2013-11-04 17:47:41.000000000 +0100
+@@ -122,7 +122,7 @@
+ {
+
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &A,
++ this->DefineParameters(A.ncols(), nevp, &A,
+ &(ARbdNonSymMatrix<ARFLOAT, ARFLOAT>::MultMv),
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+@@ -137,10 +137,10 @@
+
+ {
+
+- DefineParameters(A.ncols(), nevp, &A,
++ this->DefineParameters(A.ncols(), nevp, &A,
+ &ARbdNonSymMatrix<ARFLOAT, ARFLOAT>::MultInvv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+- ChangeShift(sigmap);
++ this->ChangeShift(sigmap);
+
+ } // Long constructor (shift and invert mode).
+
+Index: arpack++-2.3/include/arbssym.h
+===================================================================
+--- arpack++-2.3.orig/include/arbssym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arbssym.h 2013-11-04 17:45:24.000000000 +0100
+@@ -120,7 +120,7 @@
+ {
+
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &A, &ARbdSymMatrix<ARFLOAT>::MultMv,
++ this->DefineParameters(A.ncols(), nevp, &A, &ARbdSymMatrix<ARFLOAT>::MultMv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (regular mode).
+@@ -134,9 +134,9 @@
+
+ {
+
+- DefineParameters(A.ncols(), nevp, &A, &ARbdSymMatrix<ARFLOAT>::MultInvv,
++ this->DefineParameters(A.ncols(), nevp, &A, &ARbdSymMatrix<ARFLOAT>::MultInvv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+- ChangeShift(sigmap);
++ this->ChangeShift(sigmap);
+
+ } // Long constructor (shift and invert mode).
+
+Index: arpack++-2.3/include/ardgcomp.h
+===================================================================
+--- arpack++-2.3.orig/include/ardgcomp.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/ardgcomp.h 2013-11-04 17:47:58.000000000 +0100
+@@ -156,7 +156,7 @@
+
+ Pencil.DefineMatrices(A, B);
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARdsNonSymPencil<arcomplex<ARFLOAT>, ARFLOAT>::MultInvBAv,
+ &Pencil,
+ &ARdsNonSymPencil<arcomplex<ARFLOAT>, ARFLOAT>::MultBv,
+@@ -176,7 +176,7 @@
+ {
+
+ Pencil.DefineMatrices(A, B);
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARdsNonSymPencil<arcomplex<ARFLOAT>, ARFLOAT>::MultInvAsBv,
+ &Pencil,
+ &ARdsNonSymPencil<arcomplex<ARFLOAT>, ARFLOAT>::MultBv,
+Index: arpack++-2.3/include/ardgnsym.h
+===================================================================
+--- arpack++-2.3.orig/include/ardgnsym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/ardgnsym.h 2013-11-04 17:48:12.000000000 +0100
+@@ -179,7 +179,7 @@
+
+ Pencil.DefineMatrices(A, B);
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARdsNonSymPencil<ARFLOAT, ARFLOAT>::MultInvBAv, &Pencil,
+ &ARdsNonSymPencil<ARFLOAT, ARFLOAT>::MultBv, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+@@ -197,7 +197,7 @@
+ {
+
+ Pencil.DefineMatrices(A, B);
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARdsNonSymPencil<ARFLOAT, ARFLOAT>::MultInvAsBv, &Pencil,
+ &ARdsNonSymPencil<ARFLOAT, ARFLOAT>::MultBv, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+@@ -217,7 +217,7 @@
+ {
+
+ Pencil.DefineMatrices(A, B);
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARdsNonSymPencil<ARFLOAT, ARFLOAT>::MultInvAsBv, &Pencil,
+ &ARdsNonSymPencil<ARFLOAT, ARFLOAT>::MultBv, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+Index: arpack++-2.3/include/ardgsym.h
+===================================================================
+--- arpack++-2.3.orig/include/ardgsym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/ardgsym.h 2013-11-04 17:48:23.000000000 +0100
+@@ -179,7 +179,7 @@
+ Pencil.DefineMatrices(A, B);
+ this->InvertMode = 'S';
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARdsSymPencil<ARFLOAT>::MultInvBAv, &Pencil,
+ &ARdsSymPencil<ARFLOAT>::MultBv, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+@@ -197,7 +197,7 @@
+ {
+
+ Pencil.DefineMatrices(A, B);
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARdsSymPencil<ARFLOAT>::MultInvAsBv, &Pencil,
+ &ARdsSymPencil<ARFLOAT>::MultBv, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+Index: arpack++-2.3/include/ardscomp.h
+===================================================================
+--- arpack++-2.3.orig/include/ardscomp.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/ardscomp.h 2013-11-04 17:48:36.000000000 +0100
+@@ -124,7 +124,7 @@
+ {
+
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &A,
++ this->DefineParameters(A.ncols(), nevp, &A,
+ &ARdsNonSymMatrix<arcomplex<ARFLOAT>, ARFLOAT>::MultMv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+@@ -140,10 +140,10 @@
+
+ {
+
+- DefineParameters(A.ncols(), nevp, &A,
++ this->DefineParameters(A.ncols(), nevp, &A,
+ &ARdsNonSymMatrix<arcomplex<ARFLOAT>, ARFLOAT>::MultInvv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+- ChangeShift(sigmap);
++ this->ChangeShift(sigmap);
+
+ } // Long constructor (shift and invert mode).
+
+Index: arpack++-2.3/include/ardsnsym.h
+===================================================================
+--- arpack++-2.3.orig/include/ardsnsym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/ardsnsym.h 2013-11-04 17:45:57.000000000 +0100
+@@ -122,7 +122,7 @@
+ {
+
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &A,
++ this->DefineParameters(A.ncols(), nevp, &A,
+ &ARdsNonSymMatrix<ARFLOAT, ARFLOAT>::MultMv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+@@ -137,10 +137,10 @@
+
+ {
+
+- DefineParameters(A.ncols(), nevp, &A,
++ this->DefineParameters(A.ncols(), nevp, &A,
+ &ARdsNonSymMatrix<ARFLOAT, ARFLOAT>::MultInvv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+- ChangeShift(sigmap);
++ this->ChangeShift(sigmap);
+
+ } // Long constructor (shift and invert mode).
+
+Index: arpack++-2.3/include/ardssym.h
+===================================================================
+--- arpack++-2.3.orig/include/ardssym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/ardssym.h 2013-11-04 17:44:01.000000000 +0100
+@@ -120,7 +120,7 @@
+ {
+
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &A, &ARdsSymMatrix<ARFLOAT>::MultMv,
++ this->DefineParameters(A.ncols(), nevp, &A, &ARdsSymMatrix<ARFLOAT>::MultMv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (regular mode).
+@@ -134,9 +134,9 @@
+
+ {
+
+- DefineParameters(A.ncols(), nevp, &A, &ARdsSymMatrix<ARFLOAT>::MultInvv,
++ this->DefineParameters(A.ncols(), nevp, &A, &ARdsSymMatrix<ARFLOAT>::MultInvv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+- ChangeShift(sigmap);
++ this->ChangeShift(sigmap);
+
+ } // Long constructor (shift and invert mode).
+
+Index: arpack++-2.3/include/argcomp.h
+===================================================================
+--- arpack++-2.3.orig/include/argcomp.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/argcomp.h 2013-11-04 17:48:48.000000000 +0100
+@@ -84,7 +84,7 @@
+ {
+
+ this->NoShift();
+- DefineParameters(np, nevp, objOPp, MultOPxp, objBp, MultBxp,
++ this->DefineParameters(np, nevp, objOPp, MultOPxp, objBp, MultBxp,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (regular mode).
+@@ -101,8 +101,8 @@
+
+ {
+
+- ChangeShift(sigmap);
+- DefineParameters(np, nevp, objOPp, MultOPxp, objBp, MultBxp,
++ this->ChangeShift(sigmap);
++ this->DefineParameters(np, nevp, objOPp, MultOPxp, objBp, MultBxp,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (shift and invert mode).
+Index: arpack++-2.3/include/argnsym.h
+===================================================================
+--- arpack++-2.3.orig/include/argnsym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/argnsym.h 2013-11-04 17:49:20.000000000 +0100
+@@ -299,7 +299,7 @@
+
+ this->part = 'R'; // Considering mode = 3 in ChangeShift.
+ this->NoShift();
+- DefineParameters(np, nevp, objOPp, MultOPxp, objBp, MultBxp,
++ this->DefineParameters(np, nevp, objOPp, MultOPxp, objBp, MultBxp,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (regular mode).
+@@ -316,7 +316,7 @@
+ {
+
+ SetShiftInvertMode(sigmap, objOPp, MultOPxp);
+- DefineParameters(np, nevp, objOPp, MultOPxp, objBp, MultBxp,
++ this->DefineParameters(np, nevp, objOPp, MultOPxp, objBp, MultBxp,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+
+@@ -337,7 +337,7 @@
+
+ SetComplexShiftMode(partp, sigmaRp, sigmaIp, objOPp,
+ MultOPxp, objAp, MultAxp);
+- DefineParameters(np, nevp, objOPp, MultOPxp, objBp, MultBxp,
++ this->DefineParameters(np, nevp, objOPp, MultOPxp, objBp, MultBxp,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (shift and invert mode).
+Index: arpack++-2.3/include/argsym.h
+===================================================================
+--- arpack++-2.3.orig/include/argsym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/argsym.h 2013-11-04 17:49:38.000000000 +0100
+@@ -263,9 +263,9 @@
+
+ {
+
+- this->InvertMode = 'S';
++ this->InvertMode = 'S';
+ this->NoShift();
+- DefineParameters(np, nevp, objOPp, MultOPxp, objBp, MultBxp,
++ this->DefineParameters(np, nevp, objOPp, MultOPxp, objBp, MultBxp,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (regular mode).
+@@ -283,7 +283,7 @@
+
+ this->InvertMode = this->CheckInvertMode(InvertModep); // InvertMode = 'S' or 'B'.
+ this->ChangeShift(sigmap);
+- DefineParameters(np, nevp, objOPp, MultOPxp, objBp, MultBxp,
++ this->DefineParameters(np, nevp, objOPp, MultOPxp, objBp, MultBxp,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (shift-and-invert and buckling mode).
+@@ -301,7 +301,7 @@
+ {
+
+ SetCayleyMode(sigmap, objOPp, this->MultOPx, objAp, MultAxp);
+- DefineParameters(np, nevp, objOPp, MultOPxp, objBp, MultBxp,
++ this->DefineParameters(np, nevp, objOPp, MultOPxp, objBp, MultBxp,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (cayley mode).
+Index: arpack++-2.3/include/arlgcomp.h
+===================================================================
+--- arpack++-2.3.orig/include/arlgcomp.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arlgcomp.h 2013-11-04 17:49:48.000000000 +0100
+@@ -156,7 +156,7 @@
+
+ Pencil.DefineMatrices(A, B);
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARluNonSymPencil<arcomplex<ARFLOAT>, ARFLOAT>::MultInvBAv,
+ &Pencil,
+ &ARluNonSymPencil<arcomplex<ARFLOAT>, ARFLOAT>::MultBv,
+@@ -176,7 +176,7 @@
+ {
+
+ Pencil.DefineMatrices(A, B);
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARluNonSymPencil<arcomplex<ARFLOAT>, ARFLOAT>::MultInvAsBv,
+ &Pencil,
+ &ARluNonSymPencil<arcomplex<ARFLOAT>, ARFLOAT>::MultBv,
+Index: arpack++-2.3/include/arlgnsym.h
+===================================================================
+--- arpack++-2.3.orig/include/arlgnsym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arlgnsym.h 2013-11-04 17:50:13.000000000 +0100
+@@ -187,7 +187,7 @@
+
+ Pencil.DefineMatrices(A, B);
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARluNonSymPencil<ARFLOAT, ARFLOAT>::MultInvBAv, &Pencil,
+ &ARluNonSymPencil<ARFLOAT, ARFLOAT>::MultBv, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+@@ -205,7 +205,7 @@
+ {
+
+ Pencil.DefineMatrices(A, B);
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARluNonSymPencil<ARFLOAT, ARFLOAT>::MultInvAsBv, &Pencil,
+ &ARluNonSymPencil<ARFLOAT, ARFLOAT>::MultBv, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+@@ -225,7 +225,7 @@
+ {
+
+ Pencil.DefineMatrices(A, B);
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARluNonSymPencil<ARFLOAT, ARFLOAT>::MultInvAsBv, &Pencil,
+ &ARluNonSymPencil<ARFLOAT, ARFLOAT>::MultBv, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+Index: arpack++-2.3/include/arlgsym.h
+===================================================================
+--- arpack++-2.3.orig/include/arlgsym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arlgsym.h 2013-11-04 17:50:22.000000000 +0100
+@@ -181,7 +181,7 @@
+ Pencil.DefineMatrices(A, B);
+ this->InvertMode = 'S';
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARluSymPencil<ARFLOAT>::MultInvBAv, &Pencil,
+ &ARluSymPencil<ARFLOAT>::MultBv, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+@@ -199,7 +199,7 @@
+ {
+
+ Pencil.DefineMatrices(A, B);
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARluSymPencil<ARFLOAT>::MultInvAsBv, &Pencil,
+ &ARluSymPencil<ARFLOAT>::MultBv, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+Index: arpack++-2.3/include/arlscomp.h
+===================================================================
+--- arpack++-2.3.orig/include/arlscomp.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arlscomp.h 2013-11-04 17:50:35.000000000 +0100
+@@ -146,7 +146,7 @@
+ {
+
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &A,
++ this->DefineParameters(A.ncols(), nevp, &A,
+ &ARluNonSymMatrix<arcomplex<ARFLOAT>, ARFLOAT>::MultMv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+@@ -162,10 +162,10 @@
+
+ {
+
+- DefineParameters(A.ncols(), nevp, &A,
++ this->DefineParameters(A.ncols(), nevp, &A,
+ &ARluNonSymMatrix<arcomplex<ARFLOAT>, ARFLOAT>::MultInvv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+- ChangeShift(sigmap);
++ this->ChangeShift(sigmap);
+
+ } // Long constructor (shift and invert mode).
+
+Index: arpack++-2.3/include/arlsnsym.h
+===================================================================
+--- arpack++-2.3.orig/include/arlsnsym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arlsnsym.h 2013-11-04 17:50:48.000000000 +0100
+@@ -141,7 +141,7 @@
+ {
+
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &A,
++ this->DefineParameters(A.ncols(), nevp, &A,
+ &ARluNonSymMatrix<ARFLOAT, ARFLOAT>::MultMv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+@@ -156,10 +156,10 @@
+
+ {
+
+- DefineParameters(A.ncols(), nevp, &A,
++ this->DefineParameters(A.ncols(), nevp, &A,
+ &ARluNonSymMatrix<ARFLOAT, ARFLOAT>::MultInvv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+- ChangeShift(sigmap);
++ this->ChangeShift(sigmap);
+
+ } // Long constructor (shift and invert mode).
+
+Index: arpack++-2.3/include/arlssym.h
+===================================================================
+--- arpack++-2.3.orig/include/arlssym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arlssym.h 2013-11-04 17:51:01.000000000 +0100
+@@ -140,7 +140,7 @@
+ {
+
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &A, &ARluSymMatrix<ARFLOAT>::MultMv,
++ this->DefineParameters(A.ncols(), nevp, &A, &ARluSymMatrix<ARFLOAT>::MultMv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (regular mode).
+@@ -154,9 +154,9 @@
+
+ {
+
+- DefineParameters(A.ncols(), nevp, &A, &ARluSymMatrix<ARFLOAT>::MultInvv,
++ this->DefineParameters(A.ncols(), nevp, &A, &ARluSymMatrix<ARFLOAT>::MultInvv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+- ChangeShift(sigmap);
++ this->ChangeShift(sigmap);
+
+ } // Long constructor (shift and invert mode).
+
+Index: arpack++-2.3/include/arrgcomp.h
+===================================================================
+--- arpack++-2.3.orig/include/arrgcomp.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arrgcomp.h 2013-11-04 17:51:13.000000000 +0100
+@@ -72,7 +72,7 @@
+ {
+
+ this->NoShift();
+- DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
++ this->DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (regular mode).
+
+@@ -85,8 +85,8 @@
+
+ {
+
+- ChangeShift(sigmap);
+- DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
++ this->ChangeShift(sigmap);
++ this->DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (shif and invert mode).
+
+Index: arpack++-2.3/include/arrgnsym.h
+===================================================================
+--- arpack++-2.3.orig/include/arrgnsym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arrgnsym.h 2013-11-04 17:51:28.000000000 +0100
+@@ -194,7 +194,7 @@
+
+ part = 'R'; // Considering mode = 3 in ChangeShift.
+ this->NoShift();
+- DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
++ this->DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (regular mode).
+
+@@ -206,7 +206,7 @@
+ {
+
+ SetShiftInvertMode(sigmap);
+- DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
++ this->DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+
+ } // Long constructor (real shift and invert mode).
+@@ -220,7 +220,7 @@
+ {
+
+ SetComplexShiftMode(partp, sigmaRp, sigmaIp);
+- DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
++ this->DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (shift and invert mode).
+
+Index: arpack++-2.3/include/arrgsym.h
+===================================================================
+--- arpack++-2.3.orig/include/arrgsym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arrgsym.h 2013-11-04 17:51:52.000000000 +0100
+@@ -197,7 +197,7 @@
+
+ InvertMode = 'S'; // Considering mode = 3 in ChangeShift.
+ this->NoShift();
+- DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
++ this->DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (regular mode).
+
+@@ -211,8 +211,8 @@
+ {
+
+ InvertMode = CheckInvertMode(InvertModep); // InvertMode = 'S', 'B', 'C'.
+- ChangeShift(sigmap);
+- DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
++ this->ChangeShift(sigmap);
++ this->DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (shift-and-invert, buckling and Cayley modes).
+
+Index: arpack++-2.3/include/arrscomp.h
+===================================================================
+--- arpack++-2.3.orig/include/arrscomp.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arrscomp.h 2013-11-04 17:52:06.000000000 +0100
+@@ -337,7 +337,7 @@
+ {
+
+ this->NoShift();
+- DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
++ this->DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (regular mode).
+
+@@ -350,8 +350,8 @@
+
+ {
+
+- ChangeShift(sigmap);
+- DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
++ this->ChangeShift(sigmap);
++ this->DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (shift and invert mode).
+
+Index: arpack++-2.3/include/arrsnsym.h
+===================================================================
+--- arpack++-2.3.orig/include/arrsnsym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arrsnsym.h 2013-11-04 17:52:27.000000000 +0100
+@@ -823,7 +823,7 @@
+ {
+
+ this->NoShift();
+- DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
++ this->DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (regular mode).
+
+@@ -835,8 +835,8 @@
+
+ {
+
+- ChangeShift(sigmap);
+- DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
++ this->ChangeShift(sigmap);
++ this->DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (shift and invert mode).
+
+Index: arpack++-2.3/include/arrssym.h
+===================================================================
+--- arpack++-2.3.orig/include/arrssym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arrssym.h 2013-11-04 17:52:38.000000000 +0100
+@@ -386,7 +386,7 @@
+ {
+
+ this->NoShift();
+- DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
++ this->DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (regular mode).
+
+@@ -399,8 +399,8 @@
+
+ {
+
+- ChangeShift(sigmap);
+- DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
++ this->ChangeShift(sigmap);
++ this->DefineParameters(np, nevp, whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (shift and invert mode).
+
+Index: arpack++-2.3/include/arscomp.h
+===================================================================
+--- arpack++-2.3.orig/include/arscomp.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arscomp.h 2013-11-04 17:52:49.000000000 +0100
+@@ -77,7 +77,7 @@
+ {
+
+ this->NoShift();
+- DefineParameters(np, nevp, objOPp, MultOPxp, whichp,
++ this->DefineParameters(np, nevp, objOPp, MultOPxp, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (regular mode).
+@@ -93,8 +93,8 @@
+
+ {
+
+- ChangeShift(sigmap);
+- DefineParameters(np, nevp, objOPp, MultOPxp, whichp,
++ this->ChangeShift(sigmap);
++ this->DefineParameters(np, nevp, objOPp, MultOPxp, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (shift and invert mode).
+Index: arpack++-2.3/include/arseig.h
+===================================================================
+--- arpack++-2.3.orig/include/arseig.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arseig.h 2013-11-04 17:44:42.000000000 +0100
+@@ -175,7 +175,7 @@
+ {
+
+ ChangeMultOPx(objOPp, MultOPxp);
+- ChangeShift(sigmap);
++ this->ChangeShift(sigmap);
+
+ } // SetShiftInvertMode.
+
+Index: arpack++-2.3/include/arsnsym.h
+===================================================================
+--- arpack++-2.3.orig/include/arsnsym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arsnsym.h 2013-11-04 17:53:06.000000000 +0100
+@@ -77,7 +77,7 @@
+ {
+
+ this->NoShift();
+- DefineParameters(np, nevp, objOPp, MultOPxp, whichp,
++ this->DefineParameters(np, nevp, objOPp, MultOPxp, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (regular mode).
+@@ -92,8 +92,8 @@
+
+ {
+
+- ChangeShift(sigmap);
+- DefineParameters(np, nevp, objOPp, MultOPxp, whichp,
++ this->ChangeShift(sigmap);
++ this->DefineParameters(np, nevp, objOPp, MultOPxp, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (shift and invert mode).
+Index: arpack++-2.3/include/arssym.h
+===================================================================
+--- arpack++-2.3.orig/include/arssym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arssym.h 2013-11-04 17:53:16.000000000 +0100
+@@ -77,7 +77,7 @@
+ {
+
+ this->NoShift();
+- DefineParameters(np, nevp, objOPp, MultOPxp, whichp,
++ this->DefineParameters(np, nevp, objOPp, MultOPxp, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (regular mode).
+@@ -93,7 +93,7 @@
+ {
+
+ this->ChangeShift(sigmap);
+- DefineParameters(np, nevp, objOPp, MultOPxp, whichp,
++ this->DefineParameters(np, nevp, objOPp, MultOPxp, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (shift and invert mode).
+Index: arpack++-2.3/include/arugcomp.h
+===================================================================
+--- arpack++-2.3.orig/include/arugcomp.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arugcomp.h 2013-11-04 17:53:28.000000000 +0100
+@@ -156,7 +156,7 @@
+
+ Pencil.DefineMatrices(A, B);
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARumNonSymPencil<arcomplex<ARFLOAT>, ARFLOAT>::MultInvBAv,
+ &Pencil,
+ &ARumNonSymPencil<arcomplex<ARFLOAT>, ARFLOAT>::MultBv,
+@@ -176,7 +176,7 @@
+ {
+
+ Pencil.DefineMatrices(A, B);
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARumNonSymPencil<arcomplex<ARFLOAT>, ARFLOAT>::MultInvAsBv,
+ &Pencil,
+ &ARumNonSymPencil<arcomplex<ARFLOAT>, ARFLOAT>::MultBv,
+Index: arpack++-2.3/include/arugnsym.h
+===================================================================
+--- arpack++-2.3.orig/include/arugnsym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arugnsym.h 2013-11-04 17:53:38.000000000 +0100
+@@ -180,7 +180,7 @@
+
+ Pencil.DefineMatrices(A, B);
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARumNonSymPencil<ARFLOAT, ARFLOAT>::MultInvBAv, &Pencil,
+ &ARumNonSymPencil<ARFLOAT, ARFLOAT>::MultBv, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+@@ -198,7 +198,7 @@
+ {
+
+ Pencil.DefineMatrices(A, B);
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARumNonSymPencil<ARFLOAT, ARFLOAT>::MultInvAsBv, &Pencil,
+ &ARumNonSymPencil<ARFLOAT, ARFLOAT>::MultBv, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+Index: arpack++-2.3/include/arugsym.h
+===================================================================
+--- arpack++-2.3.orig/include/arugsym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arugsym.h 2013-11-04 17:53:48.000000000 +0100
+@@ -180,7 +180,7 @@
+ Pencil.DefineMatrices(A, B);
+ this->InvertMode = 'S';
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARumSymPencil<ARFLOAT>::MultInvBAv, &Pencil,
+ &ARumSymPencil<ARFLOAT>::MultBv, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+@@ -198,7 +198,7 @@
+ {
+
+ Pencil.DefineMatrices(A, B);
+- DefineParameters(A.ncols(), nevp, &Pencil,
++ this->DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARumSymPencil<ARFLOAT>::MultInvAsBv, &Pencil,
+ &ARumSymPencil<ARFLOAT>::MultBv, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+Index: arpack++-2.3/include/aruscomp.h
+===================================================================
+--- arpack++-2.3.orig/include/aruscomp.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/aruscomp.h 2013-11-04 17:54:00.000000000 +0100
+@@ -124,7 +124,7 @@
+ {
+
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &A,
++ this->DefineParameters(A.ncols(), nevp, &A,
+ &ARumNonSymMatrix<arcomplex<ARFLOAT>, ARFLOAT>::MultMv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+@@ -140,10 +140,10 @@
+
+ {
+
+- DefineParameters(A.ncols(), nevp, &A,
++ this->DefineParameters(A.ncols(), nevp, &A,
+ &ARumNonSymMatrix<arcomplex<ARFLOAT>, ARFLOAT>::MultInvv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+- ChangeShift(sigmap);
++ this->ChangeShift(sigmap);
+
+ } // Long constructor (shift and invert mode).
+
+Index: arpack++-2.3/include/arusnsym.h
+===================================================================
+--- arpack++-2.3.orig/include/arusnsym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arusnsym.h 2013-11-04 17:54:13.000000000 +0100
+@@ -121,7 +121,7 @@
+ {
+
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &A,
++ this->DefineParameters(A.ncols(), nevp, &A,
+ &ARumNonSymMatrix<ARFLOAT, ARFLOAT>::MultMv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+@@ -136,10 +136,10 @@
+
+ {
+
+- DefineParameters(A.ncols(), nevp, &A,
++ this->DefineParameters(A.ncols(), nevp, &A,
+ &ARumNonSymMatrix<ARFLOAT, ARFLOAT>::MultInvv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+- ChangeShift(sigmap);
++ this->ChangeShift(sigmap);
+
+ } // Long constructor (shift and invert mode).
+
+Index: arpack++-2.3/include/arussym.h
+===================================================================
+--- arpack++-2.3.orig/include/arussym.h 2013-11-04 17:43:23.000000000 +0100
++++ arpack++-2.3/include/arussym.h 2013-11-04 17:54:25.000000000 +0100
+@@ -119,7 +119,7 @@
+ {
+
+ this->NoShift();
+- DefineParameters(A.ncols(), nevp, &A, &ARumSymMatrix<ARFLOAT>::MultMv,
++ this->DefineParameters(A.ncols(), nevp, &A, &ARumSymMatrix<ARFLOAT>::MultMv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+ } // Long constructor (regular mode).
+@@ -133,9 +133,9 @@
+
+ {
+
+- DefineParameters(A.ncols(), nevp, &A, &ARumSymMatrix<ARFLOAT>::MultInvv,
++ this->DefineParameters(A.ncols(), nevp, &A, &ARumSymMatrix<ARFLOAT>::MultInvv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+- ChangeShift(sigmap);
++ this->ChangeShift(sigmap);
+
+ } // Long constructor (shift and invert mode).
+
diff --git a/trunk/debian/patches/series b/trunk/debian/patches/series
index 3c0c221..f84e65b 100644
--- a/trunk/debian/patches/series
+++ b/trunk/debian/patches/series
@@ -1 +1,2 @@
arlsmat.diff
+fix-build-error.diff
diff --git a/trunk/debian/rules b/trunk/debian/rules
index 22eb491..28af580 100755
--- a/trunk/debian/rules
+++ b/trunk/debian/rules
@@ -24,16 +24,13 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
--infodir=\$${prefix}/share/info \
--includedir=/usr/include/arpack++
-
-#CXX=/usr/lib/gcc-snapshot/bin/g++
-#CC=/usr/lib/gcc-snapshot/bin/gcc
CFLAGS= -O3
CXXFLAGS= -O3
FFLAGS= -O3
debian/stamp-autotools-files:
libtoolize
- autoreconf
+ autoreconf -fi
VERSION=2.3
orig-tarball:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arpack++.git
More information about the debian-science-commits
mailing list