From: Timo Heister <timo.heister@gmail.com>
Date: Mon, 21 Dec 2015 17:51:33 +0000 (-0500)
Subject: remove warning
X-Git-Tag: v8.4.0-rc2~140^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bd01fb00463b9dad6edf5d052038b2bf1f4f754;p=dealii.git

remove warning

MSVC complains:
E:\dev\deal-git\source\numerics\error_estimator_1d.cc(197): warning C4138: '*/' found outside of comment [E:\dev\deal-git\buildtest\source\numerics\obj_numerics.debug.vcxproj]
---

diff --git a/source/numerics/error_estimator_1d.cc b/source/numerics/error_estimator_1d.cc
index 3c8accc129..1868c6d78e 100644
--- a/source/numerics/error_estimator_1d.cc
+++ b/source/numerics/error_estimator_1d.cc
@@ -187,17 +187,17 @@ estimate (const DoFHandlerType                       &dof_handler,
 template <int spacedim>
 template <typename InputVector, typename DoFHandlerType>
 void KellyErrorEstimator<1,spacedim>::
-estimate (const Mapping<1,spacedim>                  &/*mapping*/,
-          const DoFHandlerType                       &/*dof_handler*/,
+estimate (const Mapping<1,spacedim>                  & /*mapping*/,
+          const DoFHandlerType                       & /*dof_handler*/,
           const hp::QCollection<0> &,
-          const typename FunctionMap<spacedim>::type &/*neumann_bc*/,
-          const std::vector<const InputVector *>     &/*solutions*/,
-          std::vector<Vector<float>*>                &/*errors*/,
-          const ComponentMask                        &/*component_mask_*/,
-          const Function<spacedim>                   */*coefficient*/,
+          const typename FunctionMap<spacedim>::type & /*neumann_bc*/,
+          const std::vector<const InputVector *>     & /*solutions*/,
+          std::vector<Vector<float>*>                & /*errors*/,
+          const ComponentMask                        & /*component_mask_*/,
+          const Function<spacedim>                   * /*coefficient*/,
           const unsigned int,
-          const types::subdomain_id                  /*subdomain_id*/,
-          const types::material_id                   /*material_id*/)
+          const types::subdomain_id                    /*subdomain_id*/,
+          const types::material_id                     /*material_id*/)
 {
   Assert (false, ExcInternalError());
 }