From: Wolfgang Bangerth Date: Fri, 18 May 2001 08:52:47 +0000 (+0000) Subject: Make variables const and thus Intel C++ compiler more happy. X-Git-Tag: v8.0.0~19125 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac120ca7caa1041c7bd705eef779f56ac372f9cc;p=dealii.git Make variables const and thus Intel C++ compiler more happy. git-svn-id: https://svn.dealii.org/trunk@4669 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/numerics/error_estimator.h b/deal.II/deal.II/include/numerics/error_estimator.h index 9f3dd89468..7ab4fef26d 100644 --- a/deal.II/deal.II/include/numerics/error_estimator.h +++ b/deal.II/deal.II/include/numerics/error_estimator.h @@ -264,7 +264,7 @@ class KellyErrorEstimator Vector &error, const std::vector &component_mask = std::vector(), const Function *coefficients = 0, - unsigned int n_threads = multithread_info.n_default_threads); + const unsigned int n_threads = multithread_info.n_default_threads); /** * Calls the @p{estimate} diff --git a/deal.II/deal.II/source/numerics/error_estimator.cc b/deal.II/deal.II/source/numerics/error_estimator.cc index 60bc50eb9e..bd58662875 100644 --- a/deal.II/deal.II/source/numerics/error_estimator.cc +++ b/deal.II/deal.II/source/numerics/error_estimator.cc @@ -544,7 +544,7 @@ void KellyErrorEstimator::estimate (const Mapping &ma std::vector*> &errors, const std::vector &component_mask, const Function *coefficients, - unsigned int n_threads) + const unsigned int n_threads_) { // sanity checks Assert (solutions.size() > 0, @@ -557,6 +557,7 @@ void KellyErrorEstimator::estimate (const Mapping &ma // if NOT multithreaded, set n_threads to one + unsigned int n_threads = n_threads_; #ifndef DEAL_II_USE_MT n_threads = 1; #endif diff --git a/deal.II/deal.II/source/numerics/matrices.cc b/deal.II/deal.II/source/numerics/matrices.cc index 817cfe671f..487f4679bc 100644 --- a/deal.II/deal.II/source/numerics/matrices.cc +++ b/deal.II/deal.II/source/numerics/matrices.cc @@ -320,7 +320,7 @@ void MatrixCreator<1>::create_boundary_mass_matrix (const Mapping<1> &, const FunctionMap<1>::type&, Vector &, std::vector &, - const Function<1> *) + const Function<1> * const) { // what would that be in 1d? the // identity matrix on tehe boundary