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

git-svn-id: https://svn.dealii.org/trunk@4670 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 7ab4fef26d6287ec6f89d029d0265efd43d47c7f..73e2375eab16659b3d1bc19db68edda2045c7517 100644 (file)
--- a/deal.II/deal.II/include/numerics/error_estimator.h
+++ b/deal.II/deal.II/include/numerics/error_estimator.h
@@ -278,7 +278,8 @@ class KellyErrorEstimator
                          Vector<float>           &error,
                          const std::vector<bool> &component_mask = std::vector<bool>(),
                          const Function<dim>     *coefficients   = 0,
-                         unsigned int             n_threads = multithread_info.n_default_threads);
+                         const unsigned int       n_threads = multithread_info.n_default_threads);
+    
                                     /**
                                      * Same function as above, but
                                      * accepts more than one solution
@@ -314,7 +315,7 @@ class KellyErrorEstimator
                          std::vector<Vector<float>*> &errors,
                          const std::vector<bool>     &component_mask = std::vector<bool>(),
                          const Function<dim>         *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}
@@ -328,7 +329,7 @@ class KellyErrorEstimator
                          std::vector<Vector<float>*> &errors,
                          const std::vector<bool>     &component_mask = std::vector<bool>(),
                          const Function<dim>         *coefficients   = 0,
-                         unsigned int                 n_threads = multithread_info.n_default_threads);
+                         const unsigned int           n_threads = multithread_info.n_default_threads);
 
     
                                     /**

diff --git a/deal.II/deal.II/source/numerics/error_estimator.cc b/deal.II/deal.II/source/numerics/error_estimator.cc
index bd5866287585e109b3f070fb5d570800827ac313..9f17f6a72738a42bb929da24133d743a536ab424 100644 (file)
--- a/deal.II/deal.II/source/numerics/error_estimator.cc
+++ b/deal.II/deal.II/source/numerics/error_estimator.cc
@@ -65,6 +65,8 @@ KellyErrorEstimator<1>::Data::Data(const Mapping<1>                    &,
                quadrature(* static_cast <const Quadrature<0> *> (0)),
                neumann_bc(* static_cast <const FunctionMap<1>::type *> (0)),
                solutions(* static_cast <const std::vector<const Vector<double>*> *> (0)),
+               n_threads (0),
+               n_solution_vectors (0),
                face_integrals (* static_cast<FaceIntegrals*> (0))
 {
   Assert (false, ExcInternalError());
@@ -157,7 +159,7 @@ void KellyErrorEstimator<dim>::estimate (const Mapping<dim>      &mapping,
                                         Vector<float>           &error,
                                         const std::vector<bool> &component_mask,
                                         const Function<dim>     *coefficients,
-                                        unsigned int             n_threads)
+                                        const unsigned int       n_threads)
 {
                                   // just pass on to the other function
   const std::vector<const Vector<double>*> solutions (1, &solution);
@@ -175,7 +177,7 @@ void KellyErrorEstimator<dim>::estimate (const DoFHandler<dim>   &dof_handler,
                                         Vector<float>           &error,
                                         const std::vector<bool> &component_mask,
                                         const Function<dim>     *coefficients,
-                                        unsigned int             n_threads)
+                                        const unsigned int       n_threads)
 {
   Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));
   static const MappingQ1<dim> mapping;
@@ -679,7 +681,7 @@ void KellyErrorEstimator<dim>::estimate (const DoFHandler<dim>               &do
                                         std::vector<Vector<float>*>              &errors,
                                         const std::vector<bool>                  &component_mask,
                                         const Function<dim>                 *coefficients,
-                                        unsigned int                         n_threads)
+                                        const unsigned int                   n_threads)
 {
   Assert (DEAL_II_COMPAT_MAPPING, ExcCompatibility("mapping"));  
   static const MappingQ1<dim> mapping;