[arpack++] 02/04: * Team upload * Package moved to debian science * Standards-Version updated to version 3.9.2 * Codes with arlsmat.h could not be compiled. Thanks to Konstantinos Poulios for the patch (Closes: #508744) * Switch to dpkg-source 3.0 (quilt) format
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 3ddd756f77de8d63e2066137cf6e6ad11b4c5ee4
Author: sylvestre <sylvestre at 7ca82aff-d165-4cda-a4f1-7f280d66a853>
Date: Wed Aug 3 08:46:15 2011 +0000
* Team upload
* Package moved to debian science
* Standards-Version updated to version 3.9.2
* Codes with arlsmat.h could not be compiled. Thanks to Konstantinos
Poulios for the patch (Closes: #508744)
* Switch to dpkg-source 3.0 (quilt) format
git-svn-id: svn+ssh://svn.debian.org/svn/debian-science/packages/arpack++@38658 7ca82aff-d165-4cda-a4f1-7f280d66a853
---
trunk/debian/changelog | 11 +
trunk/debian/control | 10 +-
trunk/debian/libarpack++2-dev.install | 1 -
trunk/debian/libarpack++2c2a.postinst.debhelper | 10 -
trunk/debian/libarpack++2c2a.postrm.debhelper | 10 -
trunk/debian/patches/arlsmat.diff | 2380 +++++++++++++++++++++++
trunk/debian/rules | 2 +-
trunk/debian/source/format | 1 +
8 files changed, 2398 insertions(+), 27 deletions(-)
diff --git a/trunk/debian/changelog b/trunk/debian/changelog
index c2d17f0..618a73d 100644
--- a/trunk/debian/changelog
+++ b/trunk/debian/changelog
@@ -1,3 +1,14 @@
+arpack++ (2.3-2) unstable; urgency=low
+
+ * Team upload
+ * Package moved to debian science
+ * Standards-Version updated to version 3.9.2
+ * Codes with "arlsmat.h" could not be compiled. Thanks to Konstantinos
+ Poulios for the patch (Closes: #508744)
+ * Switch to dpkg-source 3.0 (quilt) format
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Wed, 03 Aug 2011 10:29:30 +0200
+
arpack++ (2.3-1) unstable; urgency=low
[ Christophe Prud'homme ]
diff --git a/trunk/debian/control b/trunk/debian/control
index df73e64..bc975c2 100644
--- a/trunk/debian/control
+++ b/trunk/debian/control
@@ -2,12 +2,12 @@ Source: arpack++
Homepage: http://ljk.imag.fr/membres/Christophe.Prudhomme/software.php
Section: devel
Priority: optional
-Build-Depends: cdbs, debhelper ( >> 4.1.0 ), g++ (>= 4.1), gfortran, libblas-dev, liblapack-dev, libarpack2-dev, chrpath
-Maintainer: Debian Scientific Computing Team <pkg-scicomp-devel at lists.alioth.debian.org>
+Build-Depends: cdbs, debhelper ( >> 4.1.0 ), g++, gfortran, libblas-dev, liblapack-dev, libarpack2-dev, chrpath
+Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Christophe Prud'homme <prudhomm at debian.org>
-Standards-Version: 3.7.3
-Vcs-Svn: svn://svn.debian.org/svn/pkg-scicomp/arpack++/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-scicomp/arpack++/
+Standards-Version: 3.9.2
+Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/arpack++/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/arpack++/
Package: libarpack++2c2a
Section: libs
diff --git a/trunk/debian/libarpack++2-dev.install b/trunk/debian/libarpack++2-dev.install
index 2c4b88f..213df9b 100644
--- a/trunk/debian/libarpack++2-dev.install
+++ b/trunk/debian/libarpack++2-dev.install
@@ -1,4 +1,3 @@
-debian/tmp/usr/lib/libarpack++.la
debian/tmp/usr/lib/libarpack++.a
debian/tmp/usr/lib/libarpack++.so
debian/tmp/usr/include/arpack++/*.h
diff --git a/trunk/debian/libarpack++2c2a.postinst.debhelper b/trunk/debian/libarpack++2c2a.postinst.debhelper
deleted file mode 100644
index eeae0fc..0000000
--- a/trunk/debian/libarpack++2c2a.postinst.debhelper
+++ /dev/null
@@ -1,10 +0,0 @@
-# Automatically added by dh_makeshlibs
-if [ "$1" = "configure" ]; then
- ldconfig
-fi
-# End automatically added section
-# Automatically added by dh_makeshlibs
-if [ "$1" = "configure" ]; then
- ldconfig
-fi
-# End automatically added section
diff --git a/trunk/debian/libarpack++2c2a.postrm.debhelper b/trunk/debian/libarpack++2c2a.postrm.debhelper
deleted file mode 100644
index 93e6ad7..0000000
--- a/trunk/debian/libarpack++2c2a.postrm.debhelper
+++ /dev/null
@@ -1,10 +0,0 @@
-# Automatically added by dh_makeshlibs
-if [ "$1" = "remove" ]; then
- ldconfig
-fi
-# End automatically added section
-# Automatically added by dh_makeshlibs
-if [ "$1" = "remove" ]; then
- ldconfig
-fi
-# End automatically added section
diff --git a/trunk/debian/patches/arlsmat.diff b/trunk/debian/patches/arlsmat.diff
new file mode 100644
index 0000000..fd0e3c9
--- /dev/null
+++ b/trunk/debian/patches/arlsmat.diff
@@ -0,0 +1,2380 @@
+diff -rupN arpack++-2.3.orig/include/arbgcomp.h arpack++-2.3/include/arbgcomp.h
+--- arpack++-2.3.orig/include/arbgcomp.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arbgcomp.h 2010-09-08 15:43:56.833481000 +0200
+@@ -18,7 +18,7 @@
+ #ifndef ARBGCOMP_H
+ #define ARBGCOMP_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arbnsmat.h"
+ #include "arbnspen.h"
+diff -rupN arpack++-2.3.orig/include/arbgnsym.h arpack++-2.3/include/arbgnsym.h
+--- arpack++-2.3.orig/include/arbgnsym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arbgnsym.h 2010-09-08 15:43:56.833481000 +0200
+@@ -18,7 +18,7 @@
+ #ifndef ARBGNSYM_H
+ #define ARBGNSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arbnsmat.h"
+ #include "arbnspen.h"
+diff -rupN arpack++-2.3.orig/include/arbgsym.h arpack++-2.3/include/arbgsym.h
+--- arpack++-2.3.orig/include/arbgsym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arbgsym.h 2010-09-08 15:43:56.833481000 +0200
+@@ -18,7 +18,7 @@
+ #ifndef ARBGSYM_H
+ #define ARBGSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arbsmat.h"
+ #include "arbspen.h"
+diff -rupN arpack++-2.3.orig/include/arbnsmat.h arpack++-2.3/include/arbnsmat.h
+--- arpack++-2.3.orig/include/arbnsmat.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arbnsmat.h 2010-09-08 15:43:56.833481000 +0200
+@@ -20,7 +20,7 @@
+ #ifndef ARBNSMAT_H
+ #define ARBNSMAT_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "armat.h"
+ #include "arerror.h"
+@@ -420,7 +420,7 @@ operator=(const ARbdNonSymMatrix<ARTYPE,
+ {
+
+ if (this != &other) { // Stroustrup suggestion.
+- ClearMem();
++ this->ClearMem();
+ Copy(other);
+ }
+ return *this;
+diff -rupN arpack++-2.3.orig/include/arbscomp.h arpack++-2.3/include/arbscomp.h
+--- arpack++-2.3.orig/include/arbscomp.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arbscomp.h 2010-09-08 15:43:56.833481000 +0200
+@@ -18,7 +18,7 @@
+ #ifndef ARBSCOMP_H
+ #define ARBSCOMP_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arscomp.h"
+ #include "arbnsmat.h"
+diff -rupN arpack++-2.3.orig/include/arbsmat.h arpack++-2.3/include/arbsmat.h
+--- arpack++-2.3.orig/include/arbsmat.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arbsmat.h 2010-09-08 15:43:56.833481000 +0200
+@@ -20,7 +20,7 @@
+ #ifndef ARBSMAT_H
+ #define ARBSMAT_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "armat.h"
+ #include "arerror.h"
+@@ -367,7 +367,7 @@ operator=(const ARbdSymMatrix<ARTYPE>& o
+ {
+
+ if (this != &other) { // Stroustrup suggestion.
+- ClearMem();
++ this->ClearMem();
+ Copy(other);
+ }
+ return *this;
+diff -rupN arpack++-2.3.orig/include/arbsnsym.h arpack++-2.3/include/arbsnsym.h
+--- arpack++-2.3.orig/include/arbsnsym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arbsnsym.h 2010-09-08 16:07:23.243480000 +0200
+@@ -18,7 +18,7 @@
+ #ifndef ARBSNSYM_H
+ #define ARBSNSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arsnsym.h"
+ #include "arbnsmat.h"
+diff -rupN arpack++-2.3.orig/include/arbssym.h arpack++-2.3/include/arbssym.h
+--- arpack++-2.3.orig/include/arbssym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arbssym.h 2010-09-08 16:07:12.753481000 +0200
+@@ -18,7 +18,7 @@
+ #ifndef ARBSSYM_H
+ #define ARBSSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arssym.h"
+ #include "arbsmat.h"
+diff -rupN arpack++-2.3.orig/include/ardgcomp.h arpack++-2.3/include/ardgcomp.h
+--- arpack++-2.3.orig/include/ardgcomp.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/ardgcomp.h 2010-09-08 15:47:46.783481000 +0200
+@@ -18,7 +18,7 @@
+ #ifndef ARDGCOMP_H
+ #define ARDGCOMP_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "ardnsmat.h"
+ #include "ardnspen.h"
+diff -rupN arpack++-2.3.orig/include/ardgnsym.h arpack++-2.3/include/ardgnsym.h
+--- arpack++-2.3.orig/include/ardgnsym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/ardgnsym.h 2010-09-08 15:47:59.843481000 +0200
+@@ -18,7 +18,7 @@
+ #ifndef ARDGNSYM_H
+ #define ARDGNSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "ardnsmat.h"
+ #include "ardnspen.h"
+diff -rupN arpack++-2.3.orig/include/ardgsym.h arpack++-2.3/include/ardgsym.h
+--- arpack++-2.3.orig/include/ardgsym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/ardgsym.h 2010-09-08 15:48:09.813481000 +0200
+@@ -18,7 +18,7 @@
+ #ifndef ARDGSYM_H
+ #define ARDGSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "ardsmat.h"
+ #include "ardspen.h"
+diff -rupN arpack++-2.3.orig/include/ardnsmat.h arpack++-2.3/include/ardnsmat.h
+--- arpack++-2.3.orig/include/ardnsmat.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/ardnsmat.h 2010-09-08 15:48:18.423481000 +0200
+@@ -20,7 +20,7 @@
+ #ifndef ARDNSMAT_H
+ #define ARDNSMAT_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "armat.h"
+ #include "arerror.h"
+diff -rupN arpack++-2.3.orig/include/ardscomp.h arpack++-2.3/include/ardscomp.h
+--- arpack++-2.3.orig/include/ardscomp.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/ardscomp.h 2010-09-08 16:06:42.293481000 +0200
+@@ -18,7 +18,7 @@
+ #ifndef ARDSCOMP_H
+ #define ARDSCOMP_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arscomp.h"
+ #include "ardnsmat.h"
+diff -rupN arpack++-2.3.orig/include/ardsmat.h arpack++-2.3/include/ardsmat.h
+--- arpack++-2.3.orig/include/ardsmat.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/ardsmat.h 2010-09-08 16:06:34.113481000 +0200
+@@ -20,7 +20,7 @@
+ #ifndef ARDSMAT_H
+ #define ARDSMAT_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "armat.h"
+ #include "arerror.h"
+@@ -345,7 +345,7 @@ operator=(const ARdsSymMatrix<ARTYPE>& o
+ {
+
+ if (this != &other) { // Stroustrup suggestion.
+- ClearMem();
++ this->ClearMem();
+ Copy(other);
+ }
+ return *this;
+diff -rupN arpack++-2.3.orig/include/ardsnsym.h arpack++-2.3/include/ardsnsym.h
+--- arpack++-2.3.orig/include/ardsnsym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/ardsnsym.h 2010-09-08 16:06:21.353481000 +0200
+@@ -18,7 +18,7 @@
+ #ifndef ARDSNSYM_H
+ #define ARDSNSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arsnsym.h"
+ #include "ardnsmat.h"
+diff -rupN arpack++-2.3.orig/include/ardssym.h arpack++-2.3/include/ardssym.h
+--- arpack++-2.3.orig/include/ardssym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/ardssym.h 2010-09-08 16:06:09.443481000 +0200
+@@ -18,7 +18,7 @@
+ #ifndef ARDSSYM_H
+ #define ARDSSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arssym.h"
+ #include "ardsmat.h"
+diff -rupN arpack++-2.3.orig/include/argcomp.h arpack++-2.3/include/argcomp.h
+--- arpack++-2.3.orig/include/argcomp.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/argcomp.h 2010-09-08 16:05:57.793481000 +0200
+@@ -17,7 +17,7 @@
+ #ifndef ARGCOMP_H
+ #define ARGCOMP_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arscomp.h"
+ #include "argeig.h"
+diff -rupN arpack++-2.3.orig/include/argeig.h arpack++-2.3/include/argeig.h
+--- arpack++-2.3.orig/include/argeig.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/argeig.h 2010-09-08 16:05:41.823481000 +0200
+@@ -19,7 +19,7 @@
+ #ifndef ARGEIG_H
+ #define ARGEIG_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arerror.h"
+ #include "arrgeig.h"
+diff -rupN arpack++-2.3.orig/include/argnsym.h arpack++-2.3/include/argnsym.h
+--- arpack++-2.3.orig/include/argnsym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/argnsym.h 2010-09-08 16:05:33.803481000 +0200
+@@ -17,7 +17,7 @@
+ #ifndef ARGNSYM_H
+ #define ARGNSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "blas1c.h"
+ #include "lapackc.h"
+diff -rupN arpack++-2.3.orig/include/argsym.h arpack++-2.3/include/argsym.h
+--- arpack++-2.3.orig/include/argsym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/argsym.h 2010-09-08 16:05:23.163481000 +0200
+@@ -17,7 +17,7 @@
+ #ifndef ARGSYM_H
+ #define ARGSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arssym.h"
+ #include "arrgsym.h"
+diff -rupN arpack++-2.3.orig/include/arlgcomp.h arpack++-2.3/include/arlgcomp.h
+--- arpack++-2.3.orig/include/arlgcomp.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arlgcomp.h 2010-09-08 16:04:55.773481000 +0200
+@@ -18,7 +18,7 @@
+ #ifndef ARLGCOMP_H
+ #define ARLGCOMP_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arlnsmat.h"
+ #include "arlnspen.h"
+@@ -103,9 +103,9 @@ Copy(const ARluCompGenEig<ARFLOAT>& othe
+ ARCompGenEig<ARFLOAT, ARluNonSymPencil<arcomplex<ARFLOAT>, ARFLOAT >,
+ ARluNonSymPencil<arcomplex<ARFLOAT>, ARFLOAT> >:: Copy(other);
+ Pencil = other.Pencil;
+- objOP = &Pencil;
+- objB = &Pencil;
+- if (mode > 2) objOP->FactorAsB(sigmaR);
++ this->objOP = &Pencil;
++ this->objB = &Pencil;
++ if (this->mode > 2) this->objOP->FactorAsB(this->sigmaR);
+
+ } // Copy.
+
+@@ -114,7 +114,7 @@ template<class ARFLOAT>
+ inline void ARluCompGenEig<ARFLOAT>::ChangeShift(arcomplex<ARFLOAT> sigmap)
+ {
+
+- objOP->FactorAsB(sigmap);
++ this->objOP->FactorAsB(sigmap);
+ ARrcStdEig<ARFLOAT, arcomplex<ARFLOAT> >::ChangeShift(sigmap);
+
+ } // ChangeShift.
+@@ -155,7 +155,7 @@ ARluCompGenEig(int nevp, ARluNonSymMatri
+ {
+
+ Pencil.DefineMatrices(A, B);
+- NoShift();
++ this->NoShift();
+ DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARluNonSymPencil<arcomplex<ARFLOAT>, ARFLOAT>::MultInvBAv,
+ &Pencil,
+@@ -192,7 +192,7 @@ operator=(const ARluCompGenEig<ARFLOAT>&
+ {
+
+ if (this != &other) { // Stroustrup suggestion.
+- ClearMem();
++ this->ClearMem();
+ Copy(other);
+ }
+ return *this;
+diff -rupN arpack++-2.3.orig/include/arlgnsym.h arpack++-2.3/include/arlgnsym.h
+--- arpack++-2.3.orig/include/arlgnsym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arlgnsym.h 2010-09-08 16:04:42.263481000 +0200
+@@ -18,7 +18,7 @@
+ #ifndef ARLGNSYM_H
+ #define ARLGNSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arlnsmat.h"
+ #include "arlnspen.h"
+@@ -110,15 +110,15 @@ Copy(const ARluNonSymGenEig<ARFLOAT>& ot
+ ARNonSymGenEig<ARFLOAT, ARluNonSymPencil<ARFLOAT, ARFLOAT>,
+ ARluNonSymPencil<ARFLOAT, ARFLOAT> >:: Copy(other);
+ Pencil = other.Pencil;
+- objOP = &Pencil;
+- objB = &Pencil;
+- objA = &Pencil;
+- if (mode > 2) {
+- if (sigmaI == 0.0) {
+- objOP->FactorAsB(sigmaR);
++ this->objOP = &Pencil;
++ this->objB = &Pencil;
++ this->objA = &Pencil;
++ if (this->mode > 2) {
++ if (this->sigmaI == 0.0) {
++ this->objOP->FactorAsB(this->sigmaR);
+ }
+ else {
+- objOP->FactorAsB(sigmaR, sigmaI, part);
++ this->objOP->FactorAsB(this->sigmaR, this->sigmaI, this->part);
+ }
+ }
+
+@@ -131,10 +131,10 @@ ChangeShift(ARFLOAT sigmaRp, ARFLOAT sig
+ {
+
+ if (sigmaIp == 0.0) {
+- objOP->FactorAsB(sigmaRp);
++ this->objOP->FactorAsB(sigmaRp);
+ }
+ else {
+- objOP->FactorAsB(sigmaRp, sigmaIp, part);
++ this->objOP->FactorAsB(sigmaRp, sigmaIp, this->part);
+ }
+ ARrcNonSymGenEig<ARFLOAT>::ChangeShift(sigmaRp, sigmaIp);
+
+@@ -186,7 +186,7 @@ ARluNonSymGenEig(int nevp, ARluNonSymMat
+ {
+
+ Pencil.DefineMatrices(A, B);
+- NoShift();
++ this->NoShift();
+ DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARluNonSymPencil<ARFLOAT, ARFLOAT>::MultInvBAv, &Pencil,
+ &ARluNonSymPencil<ARFLOAT, ARFLOAT>::MultBv, whichp,
+@@ -240,7 +240,7 @@ operator=(const ARluNonSymGenEig<ARFLOAT
+ {
+
+ if (this != &other) { // Stroustrup suggestion.
+- ClearMem();
++ this->ClearMem();
+ Copy(other);
+ }
+ return *this;
+diff -rupN arpack++-2.3.orig/include/arlgsym.h arpack++-2.3/include/arlgsym.h
+--- arpack++-2.3.orig/include/arlgsym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arlgsym.h 2010-09-08 16:04:14.103481000 +0200
+@@ -19,7 +19,7 @@
+ #ifndef ARLGSYM_H
+ #define ARLGSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arlsmat.h"
+ #include "arlspen.h"
+@@ -105,10 +105,10 @@ Copy(const ARluSymGenEig<ARFLOAT>& other
+ ARSymGenEig<ARFLOAT, ARluSymPencil<ARFLOAT>,
+ ARluSymPencil<ARFLOAT> >:: Copy(other);
+ Pencil = other.Pencil;
+- objOP = &Pencil;
+- objB = &Pencil;
+- objA = &Pencil;
+- if (mode > 2) objOP->FactorAsB(sigmaR);
++ this->objOP = &Pencil;
++ this->objB = &Pencil;
++ this->objA = &Pencil;
++ if (this->mode > 2) this->objOP->FactorAsB(this->sigmaR);
+
+ } // Copy.
+
+@@ -117,7 +117,7 @@ template<class ARFLOAT>
+ inline void ARluSymGenEig<ARFLOAT>::ChangeShift(ARFLOAT sigmap)
+ {
+
+- objOP->FactorAsB(sigmap);
++ this->objOP->FactorAsB(sigmap);
+ ARrcSymGenEig<ARFLOAT>::ChangeShift(sigmap);
+
+ } // ChangeShift.
+@@ -179,8 +179,8 @@ ARluSymGenEig(int nevp, ARluSymMatrix<AR
+ {
+
+ Pencil.DefineMatrices(A, B);
+- InvertMode = 'S';
+- NoShift();
++ this->InvertMode = 'S';
++ this->NoShift();
+ DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARluSymPencil<ARFLOAT>::MultInvBAv, &Pencil,
+ &ARluSymPencil<ARFLOAT>::MultBv, whichp,
+@@ -203,8 +203,8 @@ ARluSymGenEig(char InvertModep, int nevp
+ &ARluSymPencil<ARFLOAT>::MultInvAsBv, &Pencil,
+ &ARluSymPencil<ARFLOAT>::MultBv, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+- InvertMode = CheckInvertMode(InvertModep);
+- switch (InvertMode) {
++ this->InvertMode = this->CheckInvertMode(InvertModep);
++ switch (this->InvertMode) {
+ case 'B': // Buckling mode.
+ ChangeMultBx(&Pencil, &ARluSymPencil<ARFLOAT>::MultAv);
+ case 'S': // Shift and invert mode.
+@@ -223,7 +223,7 @@ operator=(const ARluSymGenEig<ARFLOAT>&
+ {
+
+ if (this != &other) { // Stroustrup suggestion.
+- ClearMem();
++ this->ClearMem();
+ Copy(other);
+ }
+ return *this;
+diff -rupN arpack++-2.3.orig/include/arlnsmat.h arpack++-2.3/include/arlnsmat.h
+--- arpack++-2.3.orig/include/arlnsmat.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arlnsmat.h 2010-09-08 16:04:05.793481000 +0200
+@@ -20,7 +20,7 @@
+ #ifndef ARLNSMAT_H
+ #define ARLNSMAT_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "armat.h"
+ #include "arhbmat.h"
+@@ -130,16 +130,16 @@ bool ARluNonSymMatrix<ARTYPE, ARFLOAT>::
+ // Checking if pcol is in ascending order.
+
+ i = 0;
+- while ((i!=n)&&(pcol[i]<=pcol[i+1])) i++;
+- if (i!=n) return false;
++ while ((i!=this->n)&&(pcol[i]<=pcol[i+1])) i++;
++ if (i!=this->n) return false;
+
+ // Checking if irow components are in order and within bounds.
+
+- for (i=0; i!=n; i++) {
++ for (i=0; i!=this->n; i++) {
+ j = pcol[i];
+ k = pcol[i+1]-1;
+ if (j<=k) {
+- if ((irow[j]<0)||(irow[k]>=n)) return false;
++ if ((irow[j]<0)||(irow[k]>=this->n)) return false;
+ while ((j!=k)&&(irow[j]<irow[j+1])) j++;
+ if (j!=k) return false;
+ }
+@@ -157,12 +157,12 @@ Copy(const ARluNonSymMatrix<ARTYPE, ARFL
+
+ // Copying very fundamental variables.
+
+- defined = other.defined;
++ this->defined = other.defined;
+ factored = other.factored;
+
+ // Returning from here if "other" was not initialized.
+
+- if (!defined) return;
++ if (!this->defined) return;
+
+ // Copying user-defined parameters.
+
+@@ -198,7 +198,7 @@ void ARluNonSymMatrix<ARTYPE, ARFLOAT>::
+ Destroy_CompCol_Matrix(&U);
+ StatFree();
+ }
+- if (defined) {
++ if (this->defined) {
+ Destroy_SuperMatrix_Store(&A); // delete A.Store;
+ delete[] permc;
+ delete[] permr;
+@@ -231,7 +231,7 @@ SubtractAsI(ARTYPE sigma, NCformat& A, N
+ k = 0;
+ AsI.colptr[0] = 0;
+
+- for (i=0; i!=n; i++) {
++ for (i=0; i!=this->n; i++) {
+
+ j = A.colptr[i];
+ end = A.colptr[i+1];
+@@ -264,7 +264,7 @@ SubtractAsI(ARTYPE sigma, NCformat& A, N
+
+ }
+
+- AsI.nnz = AsI.colptr[n];
++ AsI.nnz = AsI.colptr[this->n];
+
+ } // SubtractAsI.
+
+@@ -281,13 +281,13 @@ void ARluNonSymMatrix<ARTYPE, ARFLOAT>::
+
+ // Quitting the function if A was not defined.
+
+- if (!IsDefined()) {
++ if (!this->IsDefined()) {
+ throw ArpackError(ArpackError::DATA_UNDEFINED, "ARluNonSymMatrix::FactorA");
+ }
+
+ // Quitting the function if A is not square.
+
+- if (m != n) {
++ if (this->m != this->n) {
+ throw ArpackError(ArpackError::NOT_SQUARE_MATRIX,
+ "ARluNonSymMatrix::FactorA");
+ }
+@@ -308,7 +308,7 @@ void ARluNonSymMatrix<ARTYPE, ARFLOAT>::
+
+ // Reserving memory for etree (used in matrix decomposition).
+
+- etree = new int[n];
++ etree = new int[this->n];
+
+ // Defining LUStat.
+
+@@ -342,7 +342,7 @@ void ARluNonSymMatrix<ARTYPE, ARFLOAT>::
+ throw ArpackError(ArpackError::PARAMETER_ERROR,
+ "ARluNonSymMatrix::FactorA");
+ }
+- else if (info > n) { // Memory is not sufficient.
++ else if (info > this->n) { // Memory is not sufficient.
+ throw ArpackError(ArpackError::MEMORY_OVERFLOW,
+ "ARluNonSymMatrix::FactorA");
+ }
+@@ -360,14 +360,14 @@ void ARluNonSymMatrix<ARTYPE, ARFLOAT>::
+
+ // Quitting the function if A was not defined.
+
+- if (!IsDefined()) {
++ if (!this->IsDefined()) {
+ throw ArpackError(ArpackError::DATA_UNDEFINED,
+ "ARluNonSymMatrix::FactorAsI");
+ }
+
+ // Quitting the function if A is not square.
+
+- if (m != n) {
++ if (this->m != this->n) {
+ throw ArpackError(ArpackError::NOT_SQUARE_MATRIX,
+ "ARluNonSymMatrix::FactorAsI");
+ }
+@@ -400,10 +400,10 @@ void ARluNonSymMatrix<ARTYPE, ARFLOAT>::
+
+ // Creating a temporary matrix AsI.
+
+- irowi = new int[nnz+n];
+- pcoli = new int[n+1];
+- asi = new ARTYPE[nnz+n];
+- Create_CompCol_Matrix(&AsI, n, n, nnz, asi, irowi, pcoli, NC, GE);
++ irowi = new int[nnz+this->n];
++ pcoli = new int[this->n+1];
++ asi = new ARTYPE[nnz+this->n];
++ Create_CompCol_Matrix(&AsI, this->n, this->n, nnz, asi, irowi, pcoli, NC, GE);
+
+ // Subtracting sigma*I from A and storing the result on AsI.
+
+@@ -413,7 +413,7 @@ void ARluNonSymMatrix<ARTYPE, ARFLOAT>::
+
+ // Reserving memory for etree (used in matrix decomposition).
+
+- etree = new int[n];
++ etree = new int[this->n];
+
+ // Defining LUStat.
+
+@@ -448,7 +448,7 @@ void ARluNonSymMatrix<ARTYPE, ARFLOAT>::
+ throw ArpackError(ArpackError::PARAMETER_ERROR,
+ "ARluNonSymMatrix::FactorAsI");
+ }
+- else if (info > n) { // Memory is not sufficient.
++ else if (info > this->n) { // Memory is not sufficient.
+ throw ArpackError(ArpackError::MEMORY_OVERFLOW,
+ "ARluNonSymMatrix::FactorAsI");
+ }
+@@ -469,15 +469,15 @@ void ARluNonSymMatrix<ARTYPE, ARFLOAT>::
+
+ // Quitting the function if A was not defined.
+
+- if (!IsDefined()) {
++ if (!this->IsDefined()) {
+ throw ArpackError(ArpackError::DATA_UNDEFINED, "ARluNonSymMatrix::MultMv");
+ }
+
+ // Determining w = M.v.
+
+- for (i=0; i!=m; i++) w[i]=(ARTYPE)0;
++ for (i=0; i!=this->m; i++) w[i]=(ARTYPE)0;
+
+- for (i=0; i!=n; i++) {
++ for (i=0; i!=this->n; i++) {
+ t = v[i];
+ for (j=pcol[i]; j!=pcol[i+1]; j++) {
+ w[irow[j]] += t*a[j];
+@@ -496,13 +496,13 @@ void ARluNonSymMatrix<ARTYPE, ARFLOAT>::
+
+ // Quitting the function if A was not defined.
+
+- if (!IsDefined()) {
++ if (!this->IsDefined()) {
+ throw ArpackError(ArpackError::DATA_UNDEFINED, "ARluNonSymMatrix::MultMtv");
+ }
+
+ // Determining w = M'.v.
+
+- for (i=0; i!=n; i++) {
++ for (i=0; i!=this->n; i++) {
+ t = (ARTYPE)0;
+ for (j=pcol[i]; j!=pcol[i+1]; j++) {
+ t += v[irow[j]]*a[j];
+@@ -517,7 +517,7 @@ template<class ARTYPE, class ARFLOAT>
+ void ARluNonSymMatrix<ARTYPE, ARFLOAT>::MultMtMv(ARTYPE* v, ARTYPE* w)
+ {
+
+- ARTYPE* t = new ARTYPE[m];
++ ARTYPE* t = new ARTYPE[this->m];
+
+ MultMv(v,t);
+ MultMtv(t,w);
+@@ -531,7 +531,7 @@ template<class ARTYPE, class ARFLOAT>
+ void ARluNonSymMatrix<ARTYPE, ARFLOAT>::MultMMtv(ARTYPE* v, ARTYPE* w)
+ {
+
+- ARTYPE* t = new ARTYPE[n];
++ ARTYPE* t = new ARTYPE[this->n];
+
+ MultMtv(v,t);
+ MultMv(t,w);
+@@ -545,8 +545,8 @@ template<class ARTYPE, class ARFLOAT>
+ void ARluNonSymMatrix<ARTYPE, ARFLOAT>::Mult0MMt0v(ARTYPE* v, ARTYPE* w)
+ {
+
+- MultMv(&v[m],w);
+- MultMtv(v,&w[m]);
++ MultMv(&v[this->m],w);
++ MultMtv(v,&w[this->m]);
+
+ } // Mult0MMt0v.
+
+@@ -567,8 +567,8 @@ void ARluNonSymMatrix<ARTYPE, ARFLOAT>::
+ int info;
+ SuperMatrix B;
+
+- if (&v != &w) copy(n, v, 1, w, 1);
+- Create_Dense_Matrix(&B, n, 1, w, n, DN, GE);
++ if (&v != &w) copy(this->n, v, 1, w, 1);
++ Create_Dense_Matrix(&B, this->n, 1, w, this->n, DN, GE);
+ gstrs("N", &L, &U, permr, permc, &B, &info);
+ Destroy_SuperMatrix_Store(&B); // delete B.Store;
+
+@@ -581,13 +581,13 @@ DefineMatrix(int np, int nnzp, ARTYPE* a
+ double thresholdp, int orderp, bool check)
+ {
+
+- m = np;
+- n = np;
++ this->m = np;
++ this->n = np;
+ nnz = nnzp;
+ a = ap;
+ irow = irowp;
+ pcol = pcolp;
+- pcol[n] = nnz;
++ pcol[this->n] = nnz;
+ threshold = thresholdp;
+ order = orderp;
+
+@@ -600,14 +600,14 @@ DefineMatrix(int np, int nnzp, ARTYPE* a
+
+ // Creating SuperMatrix A.
+
+- Create_CompCol_Matrix(&A, n, n, nnz, a, irow, pcol, NC, GE);
++ Create_CompCol_Matrix(&A, this->n, this->n, nnz, a, irow, pcol, NC, GE);
+
+ // Reserving memory for vectors used in matrix decomposition.
+
+- permc = new int[n];
+- permr = new int[n];
++ permc = new int[this->n];
++ permr = new int[this->n];
+
+- defined = true;
++ this->defined = true;
+
+ } // DefineMatrix (square).
+
+@@ -617,14 +617,14 @@ inline void ARluNonSymMatrix<ARTYPE, ARF
+ DefineMatrix(int mp, int np, int nnzp, ARTYPE* ap, int* irowp, int* pcolp)
+ {
+
+- m = mp;
+- n = np;
++ this->m = mp;
++ this->n = np;
+ nnz = nnzp;
+ a = ap;
+ irow = irowp;
+ pcol = pcolp;
+- pcol[n] = nnz;
+- defined = true;
++ pcol[this->n] = nnz;
++ this->defined = true;
+ permc = NULL;
+ permr = NULL;
+
+diff -rupN arpack++-2.3.orig/include/arlnspen.h arpack++-2.3/include/arlnspen.h
+--- arpack++-2.3.orig/include/arlnspen.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arlnspen.h 2010-09-08 16:03:15.833481000 +0200
+@@ -17,7 +17,7 @@
+ #ifndef ARLNSPEN_H
+ #define ARLNSPEN_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arerror.h"
+ #include "blas1c.h"
+diff -rupN arpack++-2.3.orig/include/arlscomp.h arpack++-2.3/include/arlscomp.h
+--- arpack++-2.3.orig/include/arlscomp.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arlscomp.h 2010-09-08 16:03:08.093481000 +0200
+@@ -18,7 +18,7 @@
+ #ifndef ARLSCOMP_H
+ #define ARLSCOMP_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arscomp.h"
+ #include "arlnsmat.h"
+@@ -97,7 +97,7 @@ Copy(const ARluCompStdEig<ARFLOAT>& othe
+ ARStdEig<ARFLOAT, arcomplex<ARFLOAT>,
+ ARluNonSymMatrix<arcomplex<ARFLOAT>, ARFLOAT> >::
+ Copy(other);
+- if (mode > 2) objOP->FactorAsI(sigmaR);
++ if (this->mode > 2) this->objOP->FactorAsI(this->sigmaR);
+
+ } // Copy.
+
+@@ -106,7 +106,7 @@ template<class ARFLOAT>
+ inline void ARluCompStdEig<ARFLOAT>::ChangeShift(arcomplex<ARFLOAT> sigmap)
+ {
+
+- objOP->FactorAsI(sigmap);
++ this->objOP->FactorAsI(sigmap);
+ ARrcStdEig<ARFLOAT, arcomplex<ARFLOAT> >::ChangeShift(sigmap);
+
+ } // ChangeShift.
+@@ -118,7 +118,7 @@ inline void ARluCompStdEig<ARFLOAT>::Set
+
+ ARStdEig<ARFLOAT, arcomplex<ARFLOAT>,
+ ARluNonSymMatrix<arcomplex<ARFLOAT>, ARFLOAT> >::
+- SetRegularMode(objOP,
++ SetRegularMode(this->objOP,
+ &ARluNonSymMatrix<arcomplex<ARFLOAT>, ARFLOAT>::MultMv);
+
+ } // SetRegularMode.
+@@ -131,7 +131,7 @@ SetShiftInvertMode(arcomplex<ARFLOAT> si
+
+ ARStdEig<ARFLOAT, arcomplex<ARFLOAT>,
+ ARluNonSymMatrix<arcomplex<ARFLOAT>, ARFLOAT> >::
+- SetShiftInvertMode(sigmap, objOP,
++ SetShiftInvertMode(sigmap, this->objOP,
+ &ARluNonSymMatrix<arcomplex<ARFLOAT>,ARFLOAT>::MultInvv);
+
+ } // SetShiftInvertMode.
+@@ -145,7 +145,7 @@ ARluCompStdEig(int nevp, ARluNonSymMatri
+
+ {
+
+- NoShift();
++ this->NoShift();
+ DefineParameters(A.ncols(), nevp, &A,
+ &ARluNonSymMatrix<arcomplex<ARFLOAT>, ARFLOAT>::MultMv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+@@ -176,7 +176,7 @@ operator=(const ARluCompStdEig<ARFLOAT>&
+ {
+
+ if (this != &other) { // Stroustrup suggestion.
+- ClearMem();
++ this->ClearMem();
+ Copy(other);
+ }
+ return *this;
+diff -rupN arpack++-2.3.orig/include/arlsmat.h arpack++-2.3/include/arlsmat.h
+--- arpack++-2.3.orig/include/arlsmat.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arlsmat.h 2010-09-08 16:02:50.483481000 +0200
+@@ -20,7 +20,7 @@
+ #ifndef ARLSMAT_H
+ #define ARLSMAT_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "armat.h"
+ #include "arhbmat.h"
+@@ -117,12 +117,12 @@ bool ARluSymMatrix<ARTYPE>::DataOK()
+ // Checking if pcol is in ascending order.
+
+ i = 0;
+- while ((i!=n)&&(pcol[i]<=pcol[i+1])) i++;
+- if (i!=n) return false;
++ while ((i!=this->n)&&(pcol[i]<=pcol[i+1])) i++;
++ if (i!=this->n) return false;
+
+ // Checking if irow components are in order and within bounds.
+
+- for (i=0; i!=n; i++) {
++ for (i=0; i!=this->n; i++) {
+ j = pcol[i];
+ k = pcol[i+1]-1;
+ if (j<=k) {
+@@ -130,7 +130,7 @@ bool ARluSymMatrix<ARTYPE>::DataOK()
+ if ((irow[j]<0)||(irow[k]>i)) return false;
+ }
+ else { // uplo == 'L'.
+- if ((irow[j]<i)||(irow[k]>=n)) return false;
++ if ((irow[j]<i)||(irow[k]>=this->n)) return false;
+ }
+ while ((j!=k)&&(irow[j]<irow[j+1])) j++;
+ if (j!=k) return false;
+@@ -148,12 +148,12 @@ inline void ARluSymMatrix<ARTYPE>::Copy(
+
+ // Copying very fundamental variables.
+
+- defined = other.defined;
++ this->defined = other.defined;
+ factored = other.factored;
+
+ // Returning from here if "other" was not initialized.
+
+- if (!defined) return;
++ if (!this->defined) return;
+
+ // Copying user-defined parameters.
+
+@@ -183,7 +183,7 @@ void ARluSymMatrix<ARTYPE>::ClearMem()
+ Destroy_CompCol_Matrix(&U);
+ StatFree();
+ }
+- if (defined) {
++ if (this->defined) {
+ Destroy_SuperMatrix_Store(&A); // delete A.Store;
+ delete[] permc;
+ delete[] permr;
+@@ -223,13 +223,13 @@ ExpandA(NCformat& A, NCformat& Aexp, ART
+
+ // Filling colE with zeros.
+
+- for (i=0; i<=n; i++) colE[i] = 0;
++ for (i=0; i<=this->n; i++) colE[i] = 0;
+
+ // Counting the elements in each column of A.
+
+ if (uplo == 'U') {
+
+- for (i=0; i!=n; i++) {
++ for (i=0; i!=this->n; i++) {
+ k = colA[i+1];
+ if ((k!=colA[i])&&(indA[k-1]==i)) {
+ k--;
+@@ -243,7 +243,7 @@ ExpandA(NCformat& A, NCformat& Aexp, ART
+ }
+ else { // uplo == 'L'
+
+- for (i=0; i!=n; i++) {
++ for (i=0; i!=this->n; i++) {
+ k = colA[i];
+ if ((k!=colA[i+1])&&(indA[k]==i)) {
+ k++;
+@@ -258,18 +258,18 @@ ExpandA(NCformat& A, NCformat& Aexp, ART
+
+ // Summing up colE elements.
+
+- for (i=0; i<n; i++) colE[i+1]+=colE[i];
++ for (i=0; i<this->n; i++) colE[i+1]+=colE[i];
+
+ // Adding colA to colE.
+
+- for (i=n; i>0; i--) colE[i] = colE[i-1]+colA[i];
++ for (i=this->n; i>0; i--) colE[i] = colE[i-1]+colA[i];
+ colE[0] = colA[0];
+
+ // Expanding A.
+
+ if (uplo == 'U') {
+
+- for (i=0; i<n; i++) {
++ for (i=0; i<this->n; i++) {
+ for (j=colA[i]; j<(colA[i+1]-1); j++) {
+ indE[colE[i]] = indA[j];
+ indE[colE[indA[j]]] = i;
+@@ -296,7 +296,7 @@ ExpandA(NCformat& A, NCformat& Aexp, ART
+ }
+ else { // uplo == 'L'
+
+- for (i=0; i<n; i++) {
++ for (i=0; i<this->n; i++) {
+ k=colA[i];
+ if ((k!=colA[i+1])&&(indA[k]==i)) {
+ indE[colE[i]] = i;
+@@ -326,12 +326,12 @@ ExpandA(NCformat& A, NCformat& Aexp, ART
+
+ // Adjusting index.
+
+- for (i=n; i>0; i--) {
++ for (i=this->n; i>0; i--) {
+ colE[i] = colE[i-1];
+ }
+ colE[0] = 0;
+
+- Aexp.nnz = colE[n];
++ Aexp.nnz = colE[this->n];
+
+ } // ExpandA.
+
+@@ -342,7 +342,7 @@ void ARluSymMatrix<ARTYPE>::FactorA()
+
+ // Quitting the function if A was not defined.
+
+- if (!IsDefined()) {
++ if (!this->IsDefined()) {
+ throw ArpackError(ArpackError::DATA_UNDEFINED, "ARluSymMatrix::FactorA");
+ }
+
+@@ -375,9 +375,9 @@ void ARluSymMatrix<ARTYPE>::FactorA()
+ // Creating a temporary matrix Aexp.
+
+ irowi = new int[nnz*2];
+- pcoli = new int[n+1];
++ pcoli = new int[this->n+1];
+ aexp = new ARTYPE[nnz*2];
+- Create_CompCol_Matrix(&Aexp, n, n, nnz, aexp, irowi, pcoli, NC, GE);
++ Create_CompCol_Matrix(&Aexp, this->n, this->n, nnz, aexp, irowi, pcoli, NC, GE);
+
+ // Expanding A.
+
+@@ -387,7 +387,7 @@ void ARluSymMatrix<ARTYPE>::FactorA()
+
+ // Reserving memory for etree (used in matrix decomposition).
+
+- etree = new int[n];
++ etree = new int[this->n];
+
+ // Defining LUStat.
+
+@@ -421,7 +421,7 @@ void ARluSymMatrix<ARTYPE>::FactorA()
+ throw ArpackError(ArpackError::PARAMETER_ERROR,
+ "ARluSymMatrix::FactorA");
+ }
+- else if (info > n) { // Memory is not sufficient.
++ else if (info > this->n) { // Memory is not sufficient.
+ throw ArpackError(ArpackError::MEMORY_OVERFLOW,
+ "ARluSymMatrix::FactorA");
+ }
+@@ -439,7 +439,7 @@ void ARluSymMatrix<ARTYPE>::FactorAsI(AR
+
+ // Quitting the function if A was not defined.
+
+- if (!IsDefined()) {
++ if (!this->IsDefined()) {
+ throw ArpackError(ArpackError::DATA_UNDEFINED, "ARluSymMatrix::FactorAsI");
+ }
+
+@@ -471,10 +471,10 @@ void ARluSymMatrix<ARTYPE>::FactorAsI(AR
+
+ // Creating a temporary matrix AsI.
+
+- irowi = new int[nnz*2+n];
+- pcoli = new int[n+1];
+- asi = new ARTYPE[nnz*2+n];
+- Create_CompCol_Matrix(&AsI, n, n, nnz, asi, irowi, pcoli, NC, GE);
++ irowi = new int[nnz*2+this->n];
++ pcoli = new int[this->n+1];
++ asi = new ARTYPE[nnz*2+this->n];
++ Create_CompCol_Matrix(&AsI, this->n, this->n, nnz, asi, irowi, pcoli, NC, GE);
+
+ // Subtracting sigma*I from A and storing the result on AsI.
+
+@@ -484,7 +484,7 @@ void ARluSymMatrix<ARTYPE>::FactorAsI(AR
+
+ // Reserving memory for etree (used in matrix decomposition).
+
+- etree = new int[n];
++ etree = new int[this->n];
+
+ // Defining LUStat.
+
+@@ -518,7 +518,7 @@ void ARluSymMatrix<ARTYPE>::FactorAsI(AR
+ throw ArpackError(ArpackError::PARAMETER_ERROR,
+ "ARluSymMatrix::FactorAsI");
+ }
+- else if (info > n) { // Memory is not sufficient.
++ else if (info > this->n) { // Memory is not sufficient.
+ throw ArpackError(ArpackError::MEMORY_OVERFLOW,
+ "ARluSymMatrix::FactorAsI");
+ }
+@@ -539,17 +539,17 @@ void ARluSymMatrix<ARTYPE>::MultMv(ARTYP
+
+ // Quitting the function if A was not defined.
+
+- if (!IsDefined()) {
++ if (!this->IsDefined()) {
+ throw ArpackError(ArpackError::DATA_UNDEFINED, "ARluSymMatrix::MultMv");
+ }
+
+ // Determining w = M.v.
+
+- for (i=0; i!=m; i++) w[i]=(ARTYPE)0;
++ for (i=0; i!=this->m; i++) w[i]=(ARTYPE)0;
+
+ if (uplo == 'U') {
+
+- for (i=0; i!=n; i++) {
++ for (i=0; i!=this->n; i++) {
+ t = v[i];
+ k = pcol[i+1];
+ if ((k!=pcol[i])&&(irow[k-1]==i)) {
+@@ -565,7 +565,7 @@ void ARluSymMatrix<ARTYPE>::MultMv(ARTYP
+ }
+ else {
+
+- for (i=0; i!=n; i++) {
++ for (i=0; i!=this->n; i++) {
+ t = v[i];
+ k = pcol[i];
+ if ((k!=pcol[i+1])&&(irow[k]==i)) {
+@@ -599,8 +599,8 @@ void ARluSymMatrix<ARTYPE>::MultInvv(ART
+ int info;
+ SuperMatrix B;
+
+- if (&v != &w) copy(n, v, 1, w, 1);
+- Create_Dense_Matrix(&B, n, 1, w, n, DN, GE);
++ if (&v != &w) copy(this->n, v, 1, w, 1);
++ Create_Dense_Matrix(&B, this->n, 1, w, this->n, DN, GE);
+ gstrs("N", &L, &U, permr, permc, &B, &info);
+ Destroy_SuperMatrix_Store(&B); // delete B.Store;
+
+@@ -613,13 +613,13 @@ DefineMatrix(int np, int nnzp, ARTYPE* a
+ char uplop, double thresholdp, int orderp, bool check)
+ {
+
+- m = np;
+- n = np;
++ this->m = np;
++ this->n = np;
+ nnz = nnzp;
+ a = ap;
+ irow = irowp;
+ pcol = pcolp;
+- pcol[n] = nnz;
++ pcol[this->n] = nnz;
+ uplo = uplop;
+ threshold = thresholdp;
+ order = orderp;
+@@ -633,14 +633,14 @@ DefineMatrix(int np, int nnzp, ARTYPE* a
+
+ // Creating SuperMatrix A.
+
+- Create_CompCol_Matrix(&A, n, n, nnz, a, irow, pcol, NC, GE);
++ Create_CompCol_Matrix(&A, this->n, this->n, nnz, a, irow, pcol, NC, GE);
+
+ // Reserving memory for vectors used in matrix decomposition.
+
+- permc = new int[n];
+- permr = new int[n];
++ permc = new int[this->n];
++ permr = new int[this->n];
+
+- defined = true;
++ this->defined = true;
+
+ } // DefineMatrix.
+
+diff -rupN arpack++-2.3.orig/include/arlsnsym.h arpack++-2.3/include/arlsnsym.h
+--- arpack++-2.3.orig/include/arlsnsym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arlsnsym.h 2010-09-08 16:02:02.443481000 +0200
+@@ -18,7 +18,7 @@
+ #ifndef ARLSNSYM_H
+ #define ARLSNSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arsnsym.h"
+ #include "arlnsmat.h"
+@@ -91,7 +91,7 @@ Copy(const ARluNonSymStdEig<ARFLOAT>& ot
+ {
+
+ ARStdEig<ARFLOAT, ARFLOAT, ARluNonSymMatrix<ARFLOAT, ARFLOAT> >:: Copy(other);
+- if (mode > 2) objOP->FactorAsI(sigmaR);
++ if (this->mode > 2) this->objOP->FactorAsI(this->sigmaR);
+
+ } // Copy.
+
+@@ -100,13 +100,13 @@ template<class ARFLOAT>
+ inline void ARluNonSymStdEig<ARFLOAT>::ChangeShift(ARFLOAT sigmaRp)
+ {
+
+- sigmaR = sigmaRp;
+- sigmaI = 0.0;
+- mode = 3;
+- iparam[7] = mode;
++ this->sigmaR = sigmaRp;
++ this->sigmaI = 0.0;
++ this->mode = 3;
++ this->iparam[7] = this->mode;
+
+- objOP->FactorAsI(sigmaR);
+- Restart();
++ this->objOP->FactorAsI(this->sigmaR);
++ this->Restart();
+
+ } // ChangeShift.
+
+@@ -116,7 +116,7 @@ inline void ARluNonSymStdEig<ARFLOAT>::S
+ {
+
+ ARStdEig<ARFLOAT, ARFLOAT, ARluNonSymMatrix<ARFLOAT, ARFLOAT> >::
+- SetRegularMode(objOP, &ARluNonSymMatrix<ARFLOAT, ARFLOAT>::MultMv);
++ SetRegularMode(this->objOP, &ARluNonSymMatrix<ARFLOAT, ARFLOAT>::MultMv);
+
+ } // SetRegularMode.
+
+@@ -126,7 +126,7 @@ inline void ARluNonSymStdEig<ARFLOAT>::S
+ {
+
+ ARStdEig<ARFLOAT, ARFLOAT, ARluNonSymMatrix<ARFLOAT, ARFLOAT> >::
+- SetShiftInvertMode(sigmap, objOP,
++ SetShiftInvertMode(sigmap, this->objOP,
+ &ARluNonSymMatrix<ARFLOAT, ARFLOAT>::MultInvv);
+
+ } // SetShiftInvertMode.
+@@ -140,7 +140,7 @@ ARluNonSymStdEig(int nevp, ARluNonSymMat
+
+ {
+
+- NoShift();
++ this->NoShift();
+ DefineParameters(A.ncols(), nevp, &A,
+ &ARluNonSymMatrix<ARFLOAT, ARFLOAT>::MultMv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+@@ -170,7 +170,7 @@ operator=(const ARluNonSymStdEig<ARFLOAT
+ {
+
+ if (this != &other) { // Stroustrup suggestion.
+- ClearMem();
++ this->ClearMem();
+ Copy(other);
+ }
+ return *this;
+diff -rupN arpack++-2.3.orig/include/arlspdef.h arpack++-2.3/include/arlspdef.h
+--- arpack++-2.3.orig/include/arlspdef.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arlspdef.h 2010-09-08 21:49:16.893481001 +0200
+@@ -280,7 +280,7 @@ extern void Destroy_SuperNode_Matrix(
+ extern void Destroy_CompCol_Permuted(SuperMatrix *);
+ extern void Destroy_Dense_Matrix(SuperMatrix *);
+ extern void get_perm_c(int, SuperMatrix *, int *);
+-extern void sp_preorder (char*, SuperMatrix*, int*, int*, SuperMatrix*);
++extern void sp_preorder (const char*, SuperMatrix*, int*, int*, SuperMatrix*);
+ // extern void countnz (const int, int *, int *, int *, sGlobalLU_t *);
+ // extern void fixupL (const int, const int *, sGlobalLU_t *);
+
+@@ -288,16 +288,16 @@ extern void sallocateA (int, int, flo
+ extern void dallocateA (int, int, double **, int **, int **);
+ extern void callocateA (int, int, lscomplex **, int **, int **);
+ extern void zallocateA (int, int, ldcomplex **, int **, int **);
+-extern void sgstrf (char*, SuperMatrix*, float, float, int, int, int*,
++extern void sgstrf (const char*, SuperMatrix*, float, float, int, int, int*,
+ void *, int, int *, int *,
+ SuperMatrix *, SuperMatrix *, int *);
+-extern void dgstrf (char*, SuperMatrix*, double, double, int, int, int*,
++extern void dgstrf (const char*, SuperMatrix*, double, double, int, int, int*,
+ void *, int, int *, int *,
+ SuperMatrix *, SuperMatrix *, int *);
+-extern void cgstrf (char*, SuperMatrix*, float, float, int, int, int*,
++extern void cgstrf (const char*, SuperMatrix*, float, float, int, int, int*,
+ void *, int, int *, int *,
+ SuperMatrix *, SuperMatrix *, int *);
+-extern void zgstrf (char*, SuperMatrix*, double, double, int, int, int*,
++extern void zgstrf (const char*, SuperMatrix*, double, double, int, int, int*,
+ void *, int, int *, int *,
+ SuperMatrix *, SuperMatrix *, int *);
+ extern int ssnode_dfs (const int, const int, const int *, const int *,
+@@ -396,13 +396,13 @@ extern void cFillRHS (char *, int, ls
+ SuperMatrix *);
+ extern void zFillRHS (char *, int, ldcomplex *, int, SuperMatrix *,
+ SuperMatrix *);
+-extern void sgstrs (char *, SuperMatrix *, SuperMatrix *, int *, int *,
++extern void sgstrs (const char *, SuperMatrix *, SuperMatrix *, int *, int *,
+ SuperMatrix *, int *);
+-extern void dgstrs (char *, SuperMatrix *, SuperMatrix *, int *, int *,
++extern void dgstrs (const char *, SuperMatrix *, SuperMatrix *, int *, int *,
+ SuperMatrix *, int *);
+-extern void cgstrs (char *, SuperMatrix *, SuperMatrix *, int *, int *,
++extern void cgstrs (const char *, SuperMatrix *, SuperMatrix *, int *, int *,
+ SuperMatrix *, int *);
+-extern void zgstrs (char *, SuperMatrix *, SuperMatrix *, int *, int *,
++extern void zgstrs (const char *, SuperMatrix *, SuperMatrix *, int *, int *,
+ SuperMatrix *, int *);
+
+
+diff -rupN arpack++-2.3.orig/include/arlspen.h arpack++-2.3/include/arlspen.h
+--- arpack++-2.3.orig/include/arlspen.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arlspen.h 2010-09-08 16:01:45.383481000 +0200
+@@ -17,7 +17,7 @@
+ #ifndef ARLSPEN_H
+ #define ARLSPEN_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arerror.h"
+ #include "blas1c.h"
+diff -rupN arpack++-2.3.orig/include/arlssym.h arpack++-2.3/include/arlssym.h
+--- arpack++-2.3.orig/include/arlssym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arlssym.h 2010-09-08 16:01:37.113481000 +0200
+@@ -19,7 +19,7 @@
+ #ifndef ARLSSYM_H
+ #define ARLSSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arssym.h"
+ #include "arlsmat.h"
+@@ -92,7 +92,7 @@ inline void ARluSymStdEig<ARFLOAT>::Copy
+ {
+
+ ARStdEig<ARFLOAT, ARFLOAT, ARluSymMatrix<ARFLOAT> >:: Copy(other);
+- if (mode > 2) objOP->FactorAsI(sigmaR);
++ if (this->mode > 2) this->objOP->FactorAsI(this->sigmaR);
+
+ } // Copy.
+
+@@ -101,13 +101,13 @@ template<class ARFLOAT>
+ inline void ARluSymStdEig<ARFLOAT>::ChangeShift(ARFLOAT sigmaRp)
+ {
+
+- sigmaR = sigmaRp;
+- sigmaI = 0.0;
+- mode = 3;
+- iparam[7] = mode;
++ this->sigmaR = sigmaRp;
++ this->sigmaI = 0.0;
++ this->mode = 3;
++ this->iparam[7] = this->mode;
+
+- objOP->FactorAsI(sigmaR);
+- Restart();
++ this->objOP->FactorAsI(this->sigmaR);
++ this->Restart();
+
+ } // ChangeShift.
+
+@@ -117,7 +117,7 @@ inline void ARluSymStdEig<ARFLOAT>::SetR
+ {
+
+ ARStdEig<ARFLOAT, ARFLOAT, ARluSymMatrix<ARFLOAT> >::
+- SetRegularMode(objOP, &ARluSymMatrix<ARFLOAT>::MultMv);
++ SetRegularMode(this->objOP, &ARluSymMatrix<ARFLOAT>::MultMv);
+
+ } // SetRegularMode.
+
+@@ -127,7 +127,7 @@ inline void ARluSymStdEig<ARFLOAT>::SetS
+ {
+
+ ARStdEig<ARFLOAT, ARFLOAT, ARluSymMatrix<ARFLOAT> >::
+- SetShiftInvertMode(sigmap, objOP, &ARluSymMatrix<ARFLOAT>::MultInvv);
++ SetShiftInvertMode(sigmap, this->objOP, &ARluSymMatrix<ARFLOAT>::MultInvv);
+
+ } // SetShiftInvertMode.
+
+@@ -139,7 +139,7 @@ ARluSymStdEig(int nevp, ARluSymMatrix<AR
+ int maxitp, ARFLOAT* residp, bool ishiftp)
+ {
+
+- NoShift();
++ this->NoShift();
+ DefineParameters(A.ncols(), nevp, &A, &ARluSymMatrix<ARFLOAT>::MultMv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+@@ -167,7 +167,7 @@ operator=(const ARluSymStdEig<ARFLOAT>&
+ {
+
+ if (this != &other) { // Stroustrup suggestion.
+- ClearMem();
++ this->ClearMem();
+ Copy(other);
+ }
+ return *this;
+diff -rupN arpack++-2.3.orig/include/arrgcomp.h arpack++-2.3/include/arrgcomp.h
+--- arpack++-2.3.orig/include/arrgcomp.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arrgcomp.h 2010-09-08 16:01:13.133481000 +0200
+@@ -17,7 +17,7 @@
+ #ifndef ARRGCOMP_H
+ #define ARRGCOMP_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arrscomp.h"
+ #include "arrgeig.h"
+diff -rupN arpack++-2.3.orig/include/arrgnsym.h arpack++-2.3/include/arrgnsym.h
+--- arpack++-2.3.orig/include/arrgnsym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arrgnsym.h 2010-09-08 16:00:26.983481000 +0200
+@@ -17,7 +17,7 @@
+ #ifndef ARRGNSYM_H
+ #define ARRGNSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arrsnsym.h"
+ #include "arrgeig.h"
+diff -rupN arpack++-2.3.orig/include/arrgsym.h arpack++-2.3/include/arrgsym.h
+--- arpack++-2.3.orig/include/arrgsym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arrgsym.h 2010-09-08 16:00:16.203481000 +0200
+@@ -17,7 +17,7 @@
+ #ifndef ARRGSYM_H
+ #define ARRGSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arrssym.h"
+ #include "arrgeig.h"
+diff -rupN arpack++-2.3.orig/include/arrscomp.h arpack++-2.3/include/arrscomp.h
+--- arpack++-2.3.orig/include/arrscomp.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arrscomp.h 2010-09-08 15:59:59.313481000 +0200
+@@ -17,7 +17,7 @@
+ #ifndef ARRSCOMP_H
+ #define ARRSCOMP_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arerror.h"
+ #include "debug.h"
+diff -rupN arpack++-2.3.orig/include/arrsnsym.h arpack++-2.3/include/arrsnsym.h
+--- arpack++-2.3.orig/include/arrsnsym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arrsnsym.h 2010-09-08 15:59:11.113481000 +0200
+@@ -17,7 +17,7 @@
+ #ifndef ARRSNSYM_H
+ #define ARRSNSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arerror.h"
+ #include "debug.h"
+diff -rupN arpack++-2.3.orig/include/arrssym.h arpack++-2.3/include/arrssym.h
+--- arpack++-2.3.orig/include/arrssym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arrssym.h 2010-09-08 15:44:01.953480000 +0200
+@@ -17,7 +17,7 @@
+ #ifndef ARRSSYM_H
+ #define ARRSSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arerror.h"
+ #include "debug.h"
+diff -rupN arpack++-2.3.orig/include/arscomp.h arpack++-2.3/include/arscomp.h
+--- arpack++-2.3.orig/include/arscomp.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arscomp.h 2010-09-08 15:58:56.283481000 +0200
+@@ -17,7 +17,7 @@
+ #ifndef ARSCOMP_H
+ #define ARSCOMP_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arseig.h"
+ #include "arrscomp.h"
+diff -rupN arpack++-2.3.orig/include/arseig.h arpack++-2.3/include/arseig.h
+--- arpack++-2.3.orig/include/arseig.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arseig.h 2010-09-08 15:44:01.953480000 +0200
+@@ -19,7 +19,7 @@
+ #ifndef ARSEIG_H
+ #define ARSEIG_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arerror.h"
+ #include "arrseig.h"
+diff -rupN arpack++-2.3.orig/include/arsnsym.h arpack++-2.3/include/arsnsym.h
+--- arpack++-2.3.orig/include/arsnsym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arsnsym.h 2010-09-08 15:57:05.623481000 +0200
+@@ -17,7 +17,7 @@
+ #ifndef ARSNSYM_H
+ #define ARSNSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arseig.h"
+ #include "arrsnsym.h"
+diff -rupN arpack++-2.3.orig/include/arssym.h arpack++-2.3/include/arssym.h
+--- arpack++-2.3.orig/include/arssym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arssym.h 2010-09-08 15:56:43.583481000 +0200
+@@ -17,7 +17,7 @@
+ #ifndef ARSSYM_H
+ #define ARSSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arseig.h"
+ #include "arrssym.h"
+diff -rupN arpack++-2.3.orig/include/arugcomp.h arpack++-2.3/include/arugcomp.h
+--- arpack++-2.3.orig/include/arugcomp.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arugcomp.h 2010-09-08 15:56:22.283481000 +0200
+@@ -18,7 +18,7 @@
+ #ifndef ARUGCOMP_H
+ #define ARUGCOMP_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arunsmat.h"
+ #include "arunspen.h"
+@@ -103,8 +103,8 @@ Copy(const ARluCompGenEig<ARFLOAT>& othe
+ ARCompGenEig<ARFLOAT, ARumNonSymPencil<arcomplex<ARFLOAT>, ARFLOAT >,
+ ARumNonSymPencil<arcomplex<ARFLOAT>, ARFLOAT> >:: Copy(other);
+ Pencil = other.Pencil;
+- objOP = &Pencil;
+- objB = &Pencil;
++ this->objOP = &Pencil;
++ this->objB = &Pencil;
+
+ } // Copy.
+
+@@ -114,7 +114,7 @@ inline void ARluCompGenEig<ARFLOAT>::
+ ChangeShift(arcomplex<ARFLOAT> sigmaRp)
+ {
+
+- objOP->FactorAsB(sigmaRp);
++ this->objOP->FactorAsB(sigmaRp);
+ ARrcStdEig<ARFLOAT, arcomplex<ARFLOAT> >::ChangeShift(sigmaRp);
+
+ } // ChangeShift.
+@@ -155,7 +155,7 @@ ARluCompGenEig(int nevp, ARumNonSymMatri
+ {
+
+ Pencil.DefineMatrices(A, B);
+- NoShift();
++ this->NoShift();
+ DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARumNonSymPencil<arcomplex<ARFLOAT>, ARFLOAT>::MultInvBAv,
+ &Pencil,
+@@ -192,7 +192,7 @@ operator=(const ARluCompGenEig<ARFLOAT>&
+ {
+
+ if (this != &other) { // Stroustrup suggestion.
+- ClearMem();
++ this->ClearMem();
+ Copy(other);
+ }
+ return *this;
+diff -rupN arpack++-2.3.orig/include/arugnsym.h arpack++-2.3/include/arugnsym.h
+--- arpack++-2.3.orig/include/arugnsym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arugnsym.h 2010-09-08 15:56:12.453481000 +0200
+@@ -18,7 +18,7 @@
+ #ifndef ARUGNSYM_H
+ #define ARUGNSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arunsmat.h"
+ #include "arunspen.h"
+@@ -111,9 +111,9 @@ Copy(const ARluNonSymGenEig<ARFLOAT>& ot
+ ARNonSymGenEig<ARFLOAT, ARumNonSymPencil<ARFLOAT, ARFLOAT>,
+ ARumNonSymPencil<ARFLOAT, ARFLOAT> >:: Copy(other);
+ Pencil = other.Pencil;
+- objOP = &Pencil;
+- objB = &Pencil;
+- objA = &Pencil;
++ this->objOP = &Pencil;
++ this->objB = &Pencil;
++ this->objA = &Pencil;
+
+ } // Copy.
+
+@@ -124,10 +124,10 @@ ChangeShift(ARFLOAT sigmaRp, ARFLOAT sig
+ {
+
+ if (sigmaIp == 0.0) {
+- objOP->FactorAsB(sigmaRp);
++ this->objOP->FactorAsB(sigmaRp);
+ }
+ else {
+- objOP->FactorAsB(sigmaRp, sigmaIp, part);
++ this->objOP->FactorAsB(sigmaRp, sigmaIp, this->part);
+ }
+ ARrcNonSymGenEig<ARFLOAT>::ChangeShift(sigmaRp, sigmaIp);
+
+@@ -179,7 +179,7 @@ ARluNonSymGenEig(int nevp, ARumNonSymMat
+ {
+
+ Pencil.DefineMatrices(A, B);
+- NoShift();
++ this->NoShift();
+ DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARumNonSymPencil<ARFLOAT, ARFLOAT>::MultInvBAv, &Pencil,
+ &ARumNonSymPencil<ARFLOAT, ARFLOAT>::MultBv, whichp,
+@@ -233,7 +233,7 @@ operator=(const ARluNonSymGenEig<ARFLOAT
+ {
+
+ if (this != &other) { // Stroustrup suggestion.
+- ClearMem();
++ this->ClearMem();
+ Copy(other);
+ }
+ return *this;
+diff -rupN arpack++-2.3.orig/include/arugsym.h arpack++-2.3/include/arugsym.h
+--- arpack++-2.3.orig/include/arugsym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arugsym.h 2010-09-08 15:55:46.563480000 +0200
+@@ -19,7 +19,7 @@
+ #ifndef ARUGSYM_H
+ #define ARUGSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arusmat.h"
+ #include "aruspen.h"
+@@ -105,9 +105,9 @@ Copy(const ARluSymGenEig<ARFLOAT>& other
+ ARSymGenEig<ARFLOAT, ARumSymPencil<ARFLOAT>,
+ ARumSymPencil<ARFLOAT> >:: Copy(other);
+ Pencil = other.Pencil;
+- objOP = &Pencil;
+- objB = &Pencil;
+- objA = &Pencil;
++ this->objOP = &Pencil;
++ this->objB = &Pencil;
++ this->objA = &Pencil;
+
+ } // Copy.
+
+@@ -116,7 +116,7 @@ template<class ARFLOAT>
+ inline void ARluSymGenEig<ARFLOAT>::ChangeShift(ARFLOAT sigmap)
+ {
+
+- objOP->FactorAsB(sigmap);
++ this->objOP->FactorAsB(sigmap);
+ ARrcSymGenEig<ARFLOAT>::ChangeShift(sigmap);
+
+ } // ChangeShift.
+@@ -178,8 +178,8 @@ ARluSymGenEig(int nevp, ARumSymMatrix<AR
+ {
+
+ Pencil.DefineMatrices(A, B);
+- InvertMode = 'S';
+- NoShift();
++ this->InvertMode = 'S';
++ this->NoShift();
+ DefineParameters(A.ncols(), nevp, &Pencil,
+ &ARumSymPencil<ARFLOAT>::MultInvBAv, &Pencil,
+ &ARumSymPencil<ARFLOAT>::MultBv, whichp,
+@@ -202,8 +202,8 @@ ARluSymGenEig(char InvertModep, int nevp
+ &ARumSymPencil<ARFLOAT>::MultInvAsBv, &Pencil,
+ &ARumSymPencil<ARFLOAT>::MultBv, whichp,
+ ncvp, tolp, maxitp, residp, ishiftp);
+- InvertMode = CheckInvertMode(InvertModep);
+- switch (InvertMode) {
++ this->InvertMode = this->CheckInvertMode(InvertModep);
++ switch (this->InvertMode) {
+ case 'B': // Buckling mode.
+ ChangeMultBx(&Pencil, &ARumSymPencil<ARFLOAT>::MultAv);
+ case 'S': // Shift and invert mode.
+@@ -222,7 +222,7 @@ operator=(const ARluSymGenEig<ARFLOAT>&
+ {
+
+ if (this != &other) { // Stroustrup suggestion.
+- ClearMem();
++ this->ClearMem();
+ Copy(other);
+ }
+ return *this;
+diff -rupN arpack++-2.3.orig/include/arunsmat.h arpack++-2.3/include/arunsmat.h
+--- arpack++-2.3.orig/include/arunsmat.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arunsmat.h 2010-09-08 15:55:21.933481000 +0200
+@@ -20,7 +20,7 @@
+ #ifndef ARUNSMAT_H
+ #define ARUNSMAT_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "armat.h"
+ #include "arhbmat.h"
+@@ -145,16 +145,16 @@ bool ARumNonSymMatrix<ARTYPE, ARFLOAT>::
+ // Checking if pcol is in ascending order.
+
+ i = 0;
+- while ((i!=n)&&(pcol[i]<=pcol[i+1])) i++;
+- if (i!=n) return false;
++ while ((i!=this->n)&&(pcol[i]<=pcol[i+1])) i++;
++ if (i!=this->n) return false;
+
+ // Checking if irow components are in order and within bounds.
+
+- for (i=0; i!=n; i++) {
++ for (i=0; i!=this->n; i++) {
+ j = pcol[i];
+ k = pcol[i+1]-1;
+ if (j<=k) {
+- if ((irow[j]<0)||(irow[k]>=n)) return false;
++ if ((irow[j]<0)||(irow[k]>=this->n)) return false;
+ while ((j!=k)&&(irow[j]<irow[j+1])) j++;
+ if (j!=k) return false;
+ }
+@@ -190,9 +190,9 @@ Copy(const ARumNonSymMatrix<ARTYPE, ARFL
+
+ // Copying very fundamental variables and user-defined parameters.
+
+- m = other.m;
+- n = other.n;
+- defined = other.defined;
++ this->m = other.m;
++ this->n = other.n;
++ this->defined = other.defined;
+ factored = other.factored;
+ fillin = other.fillin;
+ nnz = other.nnz;
+@@ -205,7 +205,7 @@ Copy(const ARumNonSymMatrix<ARTYPE, ARFL
+
+ // Returning from here if "other" was not initialized.
+
+- if (!defined) return;
++ if (!this->defined) return;
+
+ // Copying arrays with static dimension.
+
+@@ -237,10 +237,10 @@ void ARumNonSymMatrix<ARTYPE, ARFLOAT>::
+ // Subtracting sigma from diagonal elements.
+
+ k = 0;
+- ki = n+1;
++ ki = this->n+1;
+ index[0] = 1;
+
+- for (i=0; i!=n; i++) {
++ for (i=0; i!=this->n; i++) {
+
+ j = pcol[i];
+ end = pcol[i+1];
+@@ -280,11 +280,11 @@ template<class ARTYPE, class ARFLOAT>
+ inline void ARumNonSymMatrix<ARTYPE, ARFLOAT>::CreateStructure()
+ {
+
+- int dimfact = (((fillin+1)*nnz)<(n*n)) ? (fillin+1)*nnz : n*n;
++ int dimfact = (((fillin+1)*nnz)<(this->n*this->n)) ? (fillin+1)*nnz : this->n*this->n;
+
+- ClearMem();
++ this->ClearMem();
+
+- lindex = 30*n+dimfact; // ?????
++ lindex = 30*this->n+dimfact; // ?????
+ lvalue = dimfact;
+
+ value = new ARTYPE[lvalue];
+@@ -319,13 +319,13 @@ void ARumNonSymMatrix<ARTYPE, ARFLOAT>::
+
+ // Quitting the function if A was not defined.
+
+- if (!IsDefined()) {
++ if (!this->IsDefined()) {
+ throw ArpackError(ArpackError::DATA_UNDEFINED,"ARumNonSymMatrix::FactorA");
+ }
+
+ // Quitting the function if A is not square.
+
+- if (m != n) {
++ if (this->m != this->n) {
+ throw ArpackError(ArpackError::NOT_SQUARE_MATRIX,
+ "ARumNonSymMatrix::FactorA");
+ }
+@@ -344,13 +344,13 @@ void ARumNonSymMatrix<ARTYPE, ARFLOAT>::
+ copy(nnz, a, 1, value, 1);
+ pi=pcol;
+ pj=index;
+- for (i=0; i<=n; i++) *pj++ = (*pi++)+1;
++ for (i=0; i<=this->n; i++) *pj++ = (*pi++)+1;
+ pi=irow;
+ for (i=0; i<nnz; i++) *pj++ = (*pi++)+1;
+
+ // Decomposing A.
+
+- um2fa(n, nnz, 0, false, lvalue, lindex, value,
++ um2fa(this->n, nnz, 0, false, lvalue, lindex, value,
+ index, keep, cntl, icntl, info, rinfo);
+
+ // Handling errors.
+@@ -368,14 +368,14 @@ void ARumNonSymMatrix<ARTYPE, ARFLOAT>::
+
+ // Quitting the function if A was not defined.
+
+- if (!IsDefined()) {
++ if (!this->IsDefined()) {
+ throw ArpackError(ArpackError::DATA_UNDEFINED,
+ "ARumNonSymMatrix::FactorAsI");
+ }
+
+ // Quitting the function if A is not square.
+
+- if (m != n) {
++ if (this->m != this->n) {
+ throw ArpackError(ArpackError::NOT_SQUARE_MATRIX,
+ "ARumNonSymMatrix::FactorAsI");
+ }
+@@ -390,7 +390,7 @@ void ARumNonSymMatrix<ARTYPE, ARFLOAT>::
+
+ // Decomposing AsI.
+
+- um2fa(n, nnz, 0, false, lvalue, lindex, value,
++ um2fa(this->n, nnz, 0, false, lvalue, lindex, value,
+ index, keep, cntl, icntl, info, rinfo);
+
+ // Handling errors.
+@@ -411,15 +411,15 @@ void ARumNonSymMatrix<ARTYPE, ARFLOAT>::
+
+ // Quitting the function if A was not defined.
+
+- if (!IsDefined()) {
++ if (!this->IsDefined()) {
+ throw ArpackError(ArpackError::DATA_UNDEFINED, "ARumNonSymMatrix::MultMv");
+ }
+
+ // Determining w = M.v.
+
+- for (i=0; i!=m; i++) w[i]=(ARTYPE)0;
++ for (i=0; i!=this->m; i++) w[i]=(ARTYPE)0;
+
+- for (i=0; i!=n; i++) {
++ for (i=0; i!=this->n; i++) {
+ t = v[i];
+ for (j=pcol[i]; j!=pcol[i+1]; j++) {
+ w[irow[j]] += t*a[j];
+@@ -438,13 +438,13 @@ void ARumNonSymMatrix<ARTYPE, ARFLOAT>::
+
+ // Quitting the function if A was not defined.
+
+- if (!IsDefined()) {
++ if (!this->IsDefined()) {
+ throw ArpackError(ArpackError::DATA_UNDEFINED,"ARumNonSymMatrix::MultMtv");
+ }
+
+ // Determining w = M'.v.
+
+- for (i=0; i!=n; i++) {
++ for (i=0; i!=this->n; i++) {
+ t = (ARTYPE)0;
+ for (j=pcol[i]; j!=pcol[i+1]; j++) {
+ t += v[irow[j]]*a[j];
+@@ -459,7 +459,7 @@ template<class ARTYPE, class ARFLOAT>
+ void ARumNonSymMatrix<ARTYPE, ARFLOAT>::MultMtMv(ARTYPE* v, ARTYPE* w)
+ {
+
+- ARTYPE* t = new ARTYPE[m];
++ ARTYPE* t = new ARTYPE[this->m];
+
+ MultMv(v,t);
+ MultMtv(t,w);
+@@ -473,7 +473,7 @@ template<class ARTYPE, class ARFLOAT>
+ void ARumNonSymMatrix<ARTYPE, ARFLOAT>::MultMMtv(ARTYPE* v, ARTYPE* w)
+ {
+
+- ARTYPE* t = new ARTYPE[n];
++ ARTYPE* t = new ARTYPE[this->n];
+
+ MultMtv(v,t);
+ MultMv(t,w);
+@@ -487,8 +487,8 @@ template<class ARTYPE, class ARFLOAT>
+ void ARumNonSymMatrix<ARTYPE, ARFLOAT>::Mult0MMt0v(ARTYPE* v, ARTYPE* w)
+ {
+
+- MultMv(&v[m],w);
+- MultMtv(v,&w[m]);
++ MultMv(&v[this->m],w);
++ MultMtv(v,&w[this->m]);
+
+ } // Mult0MMt0v.
+
+@@ -506,9 +506,9 @@ void ARumNonSymMatrix<ARTYPE, ARFLOAT>::
+
+ // Solving A.w = v (or AsI.w = v).
+
+- ARTYPE* space = new ARTYPE[2*n];
++ ARTYPE* space = new ARTYPE[2*this->n];
+
+- um2so(n, 0, false, lvalue, lindex, value, index,
++ um2so(this->n, 0, false, lvalue, lindex, value, index,
+ keep, v, w, space, cntl, icntl, info, rinfo);
+
+ delete[] space;
+@@ -525,13 +525,13 @@ DefineMatrix(int np, int nnzp, ARTYPE* a
+
+ // Defining member variables.
+
+- m = np;
+- n = np;
++ this->m = np;
++ this->n = np;
+ nnz = nnzp;
+ a = ap;
+ irow = irowp;
+ pcol = pcolp;
+- pcol[n] = nnz;
++ pcol[this->n] = nnz;
+ fillin = (fillinp>2) ? fillinp : 2;
+ threshold = thresholdp;
+ value = NULL;
+@@ -548,7 +548,7 @@ DefineMatrix(int np, int nnzp, ARTYPE* a
+ "ARumNonSymMatrix::DefineMatrix");
+ }
+ else {
+- defined = true;
++ this->defined = true;
+ }
+
+ } // DefineMatrix (square).
+@@ -561,15 +561,15 @@ DefineMatrix(int mp, int np, int nnzp, A
+
+ // Defining member variables.
+
+- m = mp;
+- n = np;
++ this->m = mp;
++ this->n = np;
+ nnz = nnzp;
+ a = ap;
+ irow = irowp;
+ pcol = pcolp;
+- pcol[n] = nnz;
++ pcol[this->n] = nnz;
+ fillin = 0;
+- defined = true;
++ this->defined = true;
+
+ } // DefineMatrix (rectangular).
+
+diff -rupN arpack++-2.3.orig/include/aruscomp.h arpack++-2.3/include/aruscomp.h
+--- arpack++-2.3.orig/include/aruscomp.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/aruscomp.h 2010-09-08 15:53:47.523480000 +0200
+@@ -18,7 +18,7 @@
+ #ifndef ARUSCOMP_H
+ #define ARUSCOMP_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arscomp.h"
+ #include "arunsmat.h"
+@@ -84,7 +84,7 @@ inline void ARluCompStdEig<ARFLOAT>::
+ ChangeShift(arcomplex<ARFLOAT> sigmaRp)
+ {
+
+- objOP->FactorAsI(sigmaRp);
++ this->objOP->FactorAsI(sigmaRp);
+ ARrcStdEig<ARFLOAT, arcomplex<ARFLOAT> >::ChangeShift(sigmaRp);
+
+ } // ChangeShift.
+@@ -96,7 +96,7 @@ inline void ARluCompStdEig<ARFLOAT>::Set
+
+ ARStdEig<ARFLOAT, arcomplex<ARFLOAT>,
+ ARumNonSymMatrix<arcomplex<ARFLOAT>, ARFLOAT> >::
+- SetRegularMode(objOP,
++ SetRegularMode(this->objOP,
+ &ARumNonSymMatrix<arcomplex<ARFLOAT>, ARFLOAT>::MultMv);
+
+ } // SetRegularMode.
+@@ -109,7 +109,7 @@ SetShiftInvertMode(arcomplex<ARFLOAT> si
+
+ ARStdEig<ARFLOAT, arcomplex<ARFLOAT>,
+ ARumNonSymMatrix<arcomplex<ARFLOAT>, ARFLOAT> >::
+- SetShiftInvertMode(sigmap, objOP,
++ SetShiftInvertMode(sigmap, this->objOP,
+ &ARumNonSymMatrix<arcomplex<ARFLOAT>,ARFLOAT>::MultInvv);
+
+ } // SetShiftInvertMode.
+@@ -123,7 +123,7 @@ ARluCompStdEig(int nevp, ARumNonSymMatri
+
+ {
+
+- NoShift();
++ this->NoShift();
+ DefineParameters(A.ncols(), nevp, &A,
+ &ARumNonSymMatrix<arcomplex<ARFLOAT>, ARFLOAT>::MultMv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+@@ -154,7 +154,7 @@ operator=(const ARluCompStdEig<ARFLOAT>&
+ {
+
+ if (this != &other) { // Stroustrup suggestion.
+- ClearMem();
++ this->ClearMem();
+ Copy(other);
+ }
+ return *this;
+diff -rupN arpack++-2.3.orig/include/arusmat.h arpack++-2.3/include/arusmat.h
+--- arpack++-2.3.orig/include/arusmat.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arusmat.h 2010-09-08 15:53:35.083481000 +0200
+@@ -20,7 +20,7 @@
+ #ifndef ARUSMAT_H
+ #define ARUSMAT_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "armat.h"
+ #include "arhbmat.h"
+@@ -125,12 +125,12 @@ bool ARumSymMatrix<ARTYPE>::DataOK()
+ // Checking if pcol is in ascending order.
+
+ i = 0;
+- while ((i!=n)&&(pcol[i]<=pcol[i+1])) i++;
+- if (i!=n) return false;
++ while ((i!=this->n)&&(pcol[i]<=pcol[i+1])) i++;
++ if (i!=this->n) return false;
+
+ // Checking if irow components are in order and within bounds.
+
+- for (i=0; i!=n; i++) {
++ for (i=0; i!=this->n; i++) {
+ j = pcol[i];
+ k = pcol[i+1]-1;
+ if (j<=k) {
+@@ -138,7 +138,7 @@ bool ARumSymMatrix<ARTYPE>::DataOK()
+ if ((irow[j]<0)||(irow[k]>i)) return false;
+ }
+ else { // uplo == 'L'.
+- if ((irow[j]<i)||(irow[k]>=n)) return false;
++ if ((irow[j]<i)||(irow[k]>=this->n)) return false;
+ }
+ while ((j!=k)&&(irow[j]<irow[j+1])) j++;
+ if (j!=k) return false;
+@@ -174,9 +174,9 @@ void ARumSymMatrix<ARTYPE>::Copy(const A
+
+ // Copying very fundamental variables and user-defined parameters.
+
+- m = other.m;
+- n = other.n;
+- defined = other.defined;
++ this->m = other.m;
++ this->n = other.n;
++ this->defined = other.defined;
+ factored = other.factored;
+ fillin = other.fillin;
+ nnz = other.nnz;
+@@ -190,7 +190,7 @@ void ARumSymMatrix<ARTYPE>::Copy(const A
+
+ // Returning from here if "other" was not initialized.
+
+- if (!defined) return;
++ if (!this->defined) return;
+
+ // Copying arrays with static dimension.
+
+@@ -226,13 +226,13 @@ void ARumSymMatrix<ARTYPE>::ExpandA(ARTY
+
+ // Filling index with zeros.
+
+- for (i=0; i<=n; i++) index[i] = 0;
++ for (i=0; i<=this->n; i++) index[i] = 0;
+
+ // Counting the elements in each column of A.
+
+ if (uplo == 'U') {
+
+- for (i=0; i!=n; i++) {
++ for (i=0; i!=this->n; i++) {
+ k = pcol[i+1];
+ if ((k!=pcol[i])&&(irow[k-1]==i)) {
+ k--;
+@@ -246,7 +246,7 @@ void ARumSymMatrix<ARTYPE>::ExpandA(ARTY
+ }
+ else { // uplo == 'L'
+
+- for (i=0; i!=n; i++) {
++ for (i=0; i!=this->n; i++) {
+ k = pcol[i];
+ if ((k!=pcol[i+1])&&(irow[k]==i)) {
+ k++;
+@@ -261,20 +261,20 @@ void ARumSymMatrix<ARTYPE>::ExpandA(ARTY
+
+ // Summing up index elements.
+
+- for (i=0; i<n; i++) index[i+1]+=index[i];
++ for (i=0; i<this->n; i++) index[i+1]+=index[i];
+
+ // Adding pcol to index.
+
+- for (i=n; i>0; i--) index[i] = index[i-1]+pcol[i];
++ for (i=this->n; i>0; i--) index[i] = index[i-1]+pcol[i];
+ index[0] = pcol[0];
+
+ // Expanding A.
+
+- ki = n+1;
++ ki = this->n+1;
+
+ if (uplo == 'U') {
+
+- for (i=0; i<n; i++) {
++ for (i=0; i<this->n; i++) {
+ for (j=pcol[i]; j<(pcol[i+1]-1); j++) {
+ index[ki+index[i]] = irow[j]+1;
+ index[ki+index[irow[j]]] = i+1;
+@@ -301,7 +301,7 @@ void ARumSymMatrix<ARTYPE>::ExpandA(ARTY
+ }
+ else { // uplo == 'L'
+
+- for (i=0; i<n; i++) {
++ for (i=0; i<this->n; i++) {
+ k=pcol[i];
+ if ((k!=pcol[i+1])&&(irow[k]==i)) {
+ index[ki+index[i]] = i+1;
+@@ -331,7 +331,7 @@ void ARumSymMatrix<ARTYPE>::ExpandA(ARTY
+
+ // Adjusting index.
+
+- for (i=n; i>0; i--) {
++ for (i=this->n; i>0; i--) {
+ index[i] = index[i-1]+1;
+ }
+ index[0] = 1;
+@@ -343,11 +343,11 @@ template<class ARTYPE>
+ inline void ARumSymMatrix<ARTYPE>::CreateStructure()
+ {
+
+- int dimfact = (((fillin+1)*nnz*2)<(n*n)) ? (fillin+1)*nnz*2 : n*n;
++ int dimfact = (((fillin+1)*nnz*2)<(this->n*this->n)) ? (fillin+1)*nnz*2 : this->n*this->n;
+
+ ClearMem();
+
+- lindex = 30*n+dimfact; // ?????
++ lindex = 30*this->n+dimfact; // ?????
+ lvalue = dimfact;
+
+ value = new ARTYPE[lvalue];
+@@ -382,7 +382,7 @@ void ARumSymMatrix<ARTYPE>::FactorA()
+
+ // Quitting the function if A was not defined.
+
+- if (!IsDefined()) {
++ if (!this->IsDefined()) {
+ throw ArpackError(ArpackError::DATA_UNDEFINED, "ARumSymMatrix::FactorA");
+ }
+
+@@ -396,7 +396,7 @@ void ARumSymMatrix<ARTYPE>::FactorA()
+
+ // Decomposing A.
+
+- um2fa(n, index[n], 0, false, lvalue, lindex, value,
++ um2fa(this->n, index[this->n], 0, false, lvalue, lindex, value,
+ index, keep, cntl, icntl, info, rinfo);
+
+ // Handling errors.
+@@ -414,7 +414,7 @@ void ARumSymMatrix<ARTYPE>::FactorAsI(AR
+
+ // Quitting the function if A was not defined.
+
+- if (!IsDefined()) {
++ if (!this->IsDefined()) {
+ throw ArpackError(ArpackError::DATA_UNDEFINED, "ARumSymMatrix::FactorAsI");
+ }
+
+@@ -428,7 +428,7 @@ void ARumSymMatrix<ARTYPE>::FactorAsI(AR
+
+ // Decomposing AsI.
+
+- um2fa(n, index[n], 0, false, lvalue, lindex, value,
++ um2fa(this->n, index[this->n], 0, false, lvalue, lindex, value,
+ index, keep, cntl, icntl, info, rinfo);
+
+ // Handling errors.
+@@ -449,17 +449,17 @@ void ARumSymMatrix<ARTYPE>::MultMv(ARTYP
+
+ // Quitting the function if A was not defined.
+
+- if (!IsDefined()) {
++ if (!this->IsDefined()) {
+ throw ArpackError(ArpackError::DATA_UNDEFINED, "ARumSymMatrix::MultMv");
+ }
+
+ // Determining w = M.v.
+
+- for (i=0; i!=m; i++) w[i]=(ARTYPE)0;
++ for (i=0; i!=this->m; i++) w[i]=(ARTYPE)0;
+
+ if (uplo == 'U') {
+
+- for (i=0; i!=n; i++) {
++ for (i=0; i!=this->n; i++) {
+ t = v[i];
+ k = pcol[i+1];
+ if ((k!=pcol[i])&&(irow[k-1]==i)) {
+@@ -475,7 +475,7 @@ void ARumSymMatrix<ARTYPE>::MultMv(ARTYP
+ }
+ else {
+
+- for (i=0; i!=n; i++) {
++ for (i=0; i!=this->n; i++) {
+ t = v[i];
+ k = pcol[i];
+ if ((k!=pcol[i+1])&&(irow[k]==i)) {
+@@ -506,9 +506,9 @@ void ARumSymMatrix<ARTYPE>::MultInvv(ART
+
+ // Solving A.w = v (or AsI.w = v).
+
+- ARTYPE* space = new ARTYPE[2*n];
++ ARTYPE* space = new ARTYPE[2*this->n];
+
+- um2so(n, 0, false, lvalue, lindex, value, index,
++ um2so(this->n, 0, false, lvalue, lindex, value, index,
+ keep, v, w, space, cntl, icntl, info, rinfo);
+
+ delete[] space;
+@@ -525,13 +525,13 @@ DefineMatrix(int np, int nnzp, ARTYPE* a
+
+ // Defining member variables.
+
+- m = np;
+- n = np;
++ this->m = np;
++ this->n = np;
+ nnz = nnzp;
+ a = ap;
+ irow = irowp;
+ pcol = pcolp;
+- pcol[n] = nnz;
++ pcol[this->n] = nnz;
+ uplo = uplop;
+ fillin = (fillinp>2) ? fillinp : 2;
+ threshold = thresholdp;
+@@ -549,7 +549,7 @@ DefineMatrix(int np, int nnzp, ARTYPE* a
+ "ARumSymMatrix::DefineMatrix");
+ }
+ else {
+- defined = true;
++ this->defined = true;
+ }
+
+ } // DefineMatrix.
+diff -rupN arpack++-2.3.orig/include/arusnsym.h arpack++-2.3/include/arusnsym.h
+--- arpack++-2.3.orig/include/arusnsym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arusnsym.h 2010-09-08 15:51:47.683481000 +0200
+@@ -18,7 +18,7 @@
+ #ifndef ARUSNSYM_H
+ #define ARUSNSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arsnsym.h"
+ #include "arunsmat.h"
+@@ -80,13 +80,13 @@ template<class ARFLOAT>
+ inline void ARluNonSymStdEig<ARFLOAT>::ChangeShift(ARFLOAT sigmaRp)
+ {
+
+- sigmaR = sigmaRp;
+- sigmaI = 0.0;
+- mode = 3;
+- iparam[7] = mode;
++ this->sigmaR = sigmaRp;
++ this->sigmaI = 0.0;
++ this->mode = 3;
++ this->iparam[7] = this->mode;
+
+- objOP->FactorAsI(sigmaR);
+- Restart();
++ this->objOP->FactorAsI(this->sigmaR);
++ this->Restart();
+
+ } // ChangeShift.
+
+@@ -96,7 +96,7 @@ inline void ARluNonSymStdEig<ARFLOAT>::S
+ {
+
+ ARStdEig<ARFLOAT, ARFLOAT, ARumNonSymMatrix<ARFLOAT, ARFLOAT> >::
+- SetRegularMode(objOP, &ARumNonSymMatrix<ARFLOAT, ARFLOAT>::MultMv);
++ SetRegularMode(this->objOP, &ARumNonSymMatrix<ARFLOAT, ARFLOAT>::MultMv);
+
+ } // SetRegularMode.
+
+@@ -106,7 +106,7 @@ inline void ARluNonSymStdEig<ARFLOAT>::S
+ {
+
+ ARStdEig<ARFLOAT, ARFLOAT, ARumNonSymMatrix<ARFLOAT, ARFLOAT> >::
+- SetShiftInvertMode(sigmap, objOP,
++ SetShiftInvertMode(sigmap, this->objOP,
+ &ARumNonSymMatrix<ARFLOAT, ARFLOAT>::MultInvv);
+
+ } // SetShiftInvertMode.
+@@ -120,7 +120,7 @@ ARluNonSymStdEig(int nevp, ARumNonSymMat
+
+ {
+
+- NoShift();
++ this->NoShift();
+ DefineParameters(A.ncols(), nevp, &A,
+ &ARumNonSymMatrix<ARFLOAT, ARFLOAT>::MultMv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+@@ -150,7 +150,7 @@ operator=(const ARluNonSymStdEig<ARFLOAT
+ {
+
+ if (this != &other) { // Stroustrup suggestion.
+- ClearMem();
++ this->ClearMem();
+ Copy(other);
+ }
+ return *this;
+@@ -159,4 +159,3 @@ operator=(const ARluNonSymStdEig<ARFLOAT
+
+
+ #endif // ARUSNSYM_H
+-
+diff -rupN arpack++-2.3.orig/include/arussym.h arpack++-2.3/include/arussym.h
+--- arpack++-2.3.orig/include/arussym.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/arussym.h 2010-09-08 15:50:27.943481000 +0200
+@@ -18,7 +18,7 @@
+ #ifndef ARUSSYM_H
+ #define ARUSSYM_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arssym.h"
+ #include "arusmat.h"
+@@ -80,13 +80,13 @@ template<class ARFLOAT>
+ inline void ARluSymStdEig<ARFLOAT>::ChangeShift(ARFLOAT sigmaRp)
+ {
+
+- sigmaR = sigmaRp;
+- sigmaI = 0.0;
+- mode = 3;
+- iparam[7] = mode;
++ this->sigmaR = sigmaRp;
++ this->sigmaI = 0.0;
++ this->mode = 3;
++ this->iparam[7] = this->mode;
+
+- objOP->FactorAsI(sigmaR);
+- Restart();
++ this->objOP->FactorAsI(this->sigmaR);
++ this->Restart();
+
+ } // ChangeShift.
+
+@@ -96,7 +96,7 @@ inline void ARluSymStdEig<ARFLOAT>::SetR
+ {
+
+ ARStdEig<ARFLOAT, ARFLOAT, ARumSymMatrix<ARFLOAT> >::
+- SetRegularMode(objOP, &ARumSymMatrix<ARFLOAT>::MultMv);
++ SetRegularMode(this->objOP, &ARumSymMatrix<ARFLOAT>::MultMv);
+
+ } // SetRegularMode.
+
+@@ -106,7 +106,7 @@ inline void ARluSymStdEig<ARFLOAT>::SetS
+ {
+
+ ARStdEig<ARFLOAT, ARFLOAT, ARumSymMatrix<ARFLOAT> >::
+- SetShiftInvertMode(sigmap, objOP, &ARumSymMatrix<ARFLOAT>::MultInvv);
++ SetShiftInvertMode(sigmap, this->objOP, &ARumSymMatrix<ARFLOAT>::MultInvv);
+
+ } // SetShiftInvertMode.
+
+@@ -118,7 +118,7 @@ ARluSymStdEig(int nevp, ARumSymMatrix<AR
+ int maxitp, ARFLOAT* residp, bool ishiftp)
+ {
+
+- NoShift();
++ this->NoShift();
+ DefineParameters(A.ncols(), nevp, &A, &ARumSymMatrix<ARFLOAT>::MultMv,
+ whichp, ncvp, tolp, maxitp, residp, ishiftp);
+
+@@ -146,7 +146,7 @@ operator=(const ARluSymStdEig<ARFLOAT>&
+ {
+
+ if (this != &other) { // Stroustrup suggestion.
+- ClearMem();
++ this->ClearMem();
+ Copy(other);
+ }
+ return *this;
+diff -rupN arpack++-2.3.orig/include/ceupp.h arpack++-2.3/include/ceupp.h
+--- arpack++-2.3.orig/include/ceupp.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/ceupp.h 2010-09-08 15:49:00.423481000 +0200
+@@ -17,7 +17,7 @@
+ #ifndef CEUPP_H
+ #define CEUPP_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arpackf.h"
+
+diff -rupN arpack++-2.3.orig/include/neupp.h arpack++-2.3/include/neupp.h
+--- arpack++-2.3.orig/include/neupp.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/neupp.h 2010-09-08 15:48:47.793481000 +0200
+@@ -17,7 +17,7 @@
+ #ifndef NEUPP_H
+ #define NEUPP_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arpackf.h"
+
+diff -rupN arpack++-2.3.orig/include/seupp.h arpack++-2.3/include/seupp.h
+--- arpack++-2.3.orig/include/seupp.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/seupp.h 2010-09-08 15:48:34.243481000 +0200
+@@ -17,7 +17,7 @@
+ #ifndef SEUPP_H
+ #define SEUPP_H
+
+-#include <stddef.h>
++#include <cstddef>
+ #include "arch.h"
+ #include "arpackf.h"
+
+diff -rupN arpack++-2.3.orig/include/superluc.h arpack++-2.3/include/superluc.h
+--- arpack++-2.3.orig/include/superluc.h 2006-07-07 15:06:11.000000000 +0200
++++ arpack++-2.3/include/superluc.h 2010-09-08 21:49:43.023481002 +0200
+@@ -24,7 +24,7 @@
+
+ // gstrf.
+
+-inline void gstrf(char* refact, SuperMatrix* A, double diag_pivot_thresh,
++inline void gstrf(const char* refact, SuperMatrix* A, double diag_pivot_thresh,
+ double drop_tol, int relax, int panel_size,
+ int* etree, void* work, int lwork, int* perm_r,
+ int *perm_c, SuperMatrix *L, SuperMatrix *U, int *info)
+@@ -54,7 +54,7 @@ inline void gstrf(char* refact, SuperMat
+ } // gstrf.
+
+
+-inline void gstrs(char *trans, SuperMatrix *L, SuperMatrix *U,
++inline void gstrs(const char *trans, SuperMatrix *L, SuperMatrix *U,
+ int *perm_r, int *perm_c, SuperMatrix *B, int *info)
+ {
+
diff --git a/trunk/debian/rules b/trunk/debian/rules
index 034d8c1..e1c89b0 100755
--- a/trunk/debian/rules
+++ b/trunk/debian/rules
@@ -5,7 +5,7 @@ DEB_AUTO_CLEANUP_RCS := yes
DEB_BUILDDIR := $(DEB_SRCDIR)/
DEB_CONFIGURE_SCRIPT := $(DEB_SRCDIR)/configure
DEB_MAKE_CLEAN_TARGET := clean
-DEB_MAKE_BUILD_TARGET := default
+DEB_MAKE_BUILD_TARGET := all
DEB_COMPRESS_EXCLUDE := .pdf
DEB_MAKE_INSTALL_TARGET = install $(DEB_DESTDIR)
diff --git a/trunk/debian/source/format b/trunk/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/trunk/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
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