From d5adce0ddf5ae1d61bdfd7ab8c748d7b06b6af3a Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Thu, 17 May 2001 15:15:14 +0000 Subject: [PATCH] Make variables const and thus Intel C++ compiler more happy. git-svn-id: https://svn.dealii.org/trunk@4656 0785d39b-7218-0410-832d-ea1e28bc413d --- .../lac/include/lac/sparse_matrix.2.templates | 24 +++++++++---------- .../lac/include/lac/sparse_matrix.templates.h | 6 +++-- deal.II/lac/include/lac/sparse_vanka.h | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) 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::residual (Vector &, template void SparseMatrix::precondition_SSOR (Vector &, const Vector &, - TYPEMAT) const; + const TYPEMAT) const; template void SparseMatrix::precondition_SOR (Vector &, const Vector &, - TYPEMAT) const; + const TYPEMAT) const; template void SparseMatrix::precondition_TSOR (Vector &, const Vector &, - TYPEMAT) const; + const TYPEMAT) const; template void SparseMatrix::precondition_Jacobi (Vector &, const Vector &, - TYPEMAT) const; - -template void SparseMatrix::SOR (Vector &, TYPEMAT) const; -template void SparseMatrix::TSOR (Vector &, TYPEMAT) const; -template void SparseMatrix::SSOR (Vector &, TYPEMAT) const; -template void SparseMatrix::SOR_step (Vector &, const Vector &, TYPEMAT) const; -template void SparseMatrix::TSOR_step (Vector &, const Vector &, TYPEMAT) const; -template void SparseMatrix::SSOR_step (Vector &, const Vector &, TYPEMAT) const; + const TYPEMAT) const; + +template void SparseMatrix::SOR (Vector &, const TYPEMAT) const; +template void SparseMatrix::TSOR (Vector &, const TYPEMAT) const; +template void SparseMatrix::SSOR (Vector &, const TYPEMAT) const; +template void SparseMatrix::SOR_step (Vector &, const Vector &, const TYPEMAT) const; +template void SparseMatrix::TSOR_step (Vector &, const Vector &, const TYPEMAT) const; +template void SparseMatrix::SSOR_step (Vector &, const Vector &, 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::print (std::ostream &out) const template void SparseMatrix::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 void apply_preconditioner (Vector &dst, const Vector &src, - const std::vector *dof_mask = 0) const; + const std::vector * const dof_mask = 0) const; /** * Determine an estimate for the -- 2.39.5