From: David Wells <wellsd2@rpi.edu>
Date: Thu, 17 Dec 2015 20:51:27 +0000 (-0500)
Subject: Fix issues pointed out by @slazav.
X-Git-Tag: v8.4.0-rc2~149^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5f6cb7a5f7be59251f80624cd01245bb4ffde3d;p=dealii.git

Fix issues pointed out by @slazav.

This commit fixes several compilation issues with
ShiftedMatrixGeneralized. This bug has been present since
cd072f5b77 (June 2001), so it looks like this class has never worked as
advertised.
---

diff --git a/include/deal.II/lac/shifted_matrix.h b/include/deal.II/lac/shifted_matrix.h
index 2bb727396f..6cc0c69183 100644
--- a/include/deal.II/lac/shifted_matrix.h
+++ b/include/deal.II/lac/shifted_matrix.h
@@ -147,7 +147,7 @@ private:
   /**
    * Auxiliary vector.
    */
-  VectorType aux;
+  mutable VectorType aux;
 
   /**
    * Shift parameter.
@@ -249,7 +249,7 @@ ShiftedMatrixGeneralized<MatrixType, MatrixType2, VectorType>::vmult
   if (sigma != 0.)
     {
       aux.reinit(dst);
-      M.vmult(aux, src);
+      M->vmult(aux, src);
       dst.add(sigma, aux);
     }
 }
@@ -266,7 +266,7 @@ ShiftedMatrixGeneralized<MatrixType, MatrixType2, VectorType>::residual
   if (sigma != 0.)
     {
       aux.reinit(dst);
-      M.vmult(aux, src);
+      M->vmult(aux, src);
       dst.add(sigma, aux);
     }
   dst.sadd(-1.,1.,rhs);