From: wolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Thu, 17 May 2001 15:15:14 +0000 (+0000)
Subject: Make variables const and thus Intel C++ compiler more happy.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=757627f431aabe44c7e2ec2cf73234572b1046a5;p=dealii-svn.git

Make variables const and thus Intel C++ compiler more happy.


git-svn-id: https://svn.dealii.org/trunk@4656 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/lac/include/lac/sparse_matrix.2.templates b/deal.II/lac/include/lac/sparse_matrix.2.templates
index 60134fec6d..a5a8a17438 100644
--- a/deal.II/lac/include/lac/sparse_matrix.2.templates
+++ b/deal.II/lac/include/lac/sparse_matrix.2.templates
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$
 //
-//    Copyright (C) 1998, 1999, 2000 by the deal.II authors
+//    Copyright (C) 1998, 1999, 2000, 2001 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -45,25 +45,25 @@ template TYPE2 SparseMatrix<TYPEMAT>::residual (Vector<TYPE2> &,
 
 template void SparseMatrix<TYPEMAT>::precondition_SSOR (Vector<TYPE2> &,
 						      const Vector<TYPE2> &,
-						      TYPEMAT) const;
+						      const TYPEMAT) const;
 
 template void SparseMatrix<TYPEMAT>::precondition_SOR (Vector<TYPE2> &,
 						     const Vector<TYPE2> &,
-						     TYPEMAT) const;
+						     const TYPEMAT) const;
 
 template void SparseMatrix<TYPEMAT>::precondition_TSOR (Vector<TYPE2> &,
 						     const Vector<TYPE2> &,
-						     TYPEMAT) const;
+						     const TYPEMAT) const;
 
 template void SparseMatrix<TYPEMAT>::precondition_Jacobi (Vector<TYPE2> &,
 							const Vector<TYPE2> &,
-							TYPEMAT) const;
-
-template void SparseMatrix<TYPEMAT>::SOR (Vector<TYPE2> &, TYPEMAT) const;
-template void SparseMatrix<TYPEMAT>::TSOR (Vector<TYPE2> &, TYPEMAT) const;
-template void SparseMatrix<TYPEMAT>::SSOR (Vector<TYPE2> &, TYPEMAT) const;
-template void SparseMatrix<TYPEMAT>::SOR_step (Vector<TYPE2> &, const Vector<TYPE2> &, TYPEMAT) const;
-template void SparseMatrix<TYPEMAT>::TSOR_step (Vector<TYPE2> &, const Vector<TYPE2> &, TYPEMAT) const;
-template void SparseMatrix<TYPEMAT>::SSOR_step (Vector<TYPE2> &, const Vector<TYPE2> &, TYPEMAT) const;
+							const TYPEMAT) const;
+
+template void SparseMatrix<TYPEMAT>::SOR (Vector<TYPE2> &, const TYPEMAT) const;
+template void SparseMatrix<TYPEMAT>::TSOR (Vector<TYPE2> &, const TYPEMAT) const;
+template void SparseMatrix<TYPEMAT>::SSOR (Vector<TYPE2> &, const TYPEMAT) const;
+template void SparseMatrix<TYPEMAT>::SOR_step (Vector<TYPE2> &, const Vector<TYPE2> &, const TYPEMAT) const;
+template void SparseMatrix<TYPEMAT>::TSOR_step (Vector<TYPE2> &, const Vector<TYPE2> &, const TYPEMAT) const;
+template void SparseMatrix<TYPEMAT>::SSOR_step (Vector<TYPE2> &, const Vector<TYPE2> &, const TYPEMAT) const;
 
 
diff --git a/deal.II/lac/include/lac/sparse_matrix.templates.h b/deal.II/lac/include/lac/sparse_matrix.templates.h
index 1f983f31b5..7763ded034 100644
--- a/deal.II/lac/include/lac/sparse_matrix.templates.h
+++ b/deal.II/lac/include/lac/sparse_matrix.templates.h
@@ -1022,14 +1022,16 @@ void SparseMatrix<number>::print (std::ostream &out) const
 template <typename number>
 void SparseMatrix<number>::print_formatted (std::ostream &out,
 					    const unsigned int precision,
-					    bool scientific,
-					    unsigned int width,
+					    const bool scientific,
+					    const unsigned int width_,
 					    const char* zero_string,
 					    const double denominator) const
 {
   Assert (cols != 0, ExcMatrixNotInitialized());
   Assert (val != 0, ExcMatrixNotInitialized());
 
+  unsigned int width = width_;
+  
   std::ios::fmtflags old_flags = out.flags();
   unsigned int old_precision = out.precision (precision);
 
diff --git a/deal.II/lac/include/lac/sparse_vanka.h b/deal.II/lac/include/lac/sparse_vanka.h
index b13b58b1c0..57a9e517a4 100644
--- a/deal.II/lac/include/lac/sparse_vanka.h
+++ b/deal.II/lac/include/lac/sparse_vanka.h
@@ -262,7 +262,7 @@ class SparseVanka
     template<typename number2>
     void apply_preconditioner (Vector<number2>         &dst,
 			       const Vector<number2>   &src,
-			       const std::vector<bool> *dof_mask = 0) const;    
+			       const std::vector<bool> * const dof_mask = 0) const;    
 
 				     /**
 				      * Determine an estimate for the