From: Wolfgang Bangerth Date: Thu, 4 Mar 2004 16:11:52 +0000 (+0000) Subject: Work around another problem in icc. X-Git-Tag: v8.0.0~15686 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c91d946dd006eb42d72c884f8401a4d1a892cc2c;p=dealii.git Work around another problem in icc. git-svn-id: https://svn.dealii.org/trunk@8657 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/numerics/error_estimator.cc b/deal.II/deal.II/source/numerics/error_estimator.cc index 150d438348..ee1e839af8 100644 --- a/deal.II/deal.II/source/numerics/error_estimator.cc +++ b/deal.II/deal.II/source/numerics/error_estimator.cc @@ -204,11 +204,10 @@ estimate (const Mapping<1> &mapping, (coefficient->n_components == 1), ExcInvalidCoefficient()); - for (FunctionMap<1>::type::const_iterator i=neumann_bc.begin(); i!=neumann_bc.end(); ++i) - Assert (i->second->n_components == n_components, ExcInvalidBoundaryFunction()); - - - const unsigned int dim=1; + for (FunctionMap<1>::type::const_iterator i=neumann_bc.begin(); + i!=neumann_bc.end(); ++i) + Assert (i->second->n_components == n_components, + ExcInvalidBoundaryFunction()); // reserve one slot for each cell and set // it to zero @@ -259,7 +258,7 @@ estimate (const Mapping<1> &mapping, for (unsigned int n=0; n<2; ++n) { // find right active neighbor - typename DoFHandler::cell_iterator neighbor = cell->neighbor(n); + DoFHandler<1>::cell_iterator neighbor = cell->neighbor(n); if (neighbor.state() == IteratorState::valid) while (neighbor->has_children()) neighbor = neighbor->child(n==0 ? 1 : 0);