From: Wolfgang Bangerth Date: Sun, 13 Jul 2014 18:34:51 +0000 (+0000) Subject: Make it compile. X-Git-Tag: v8.2.0-rc1~309^2~6 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be114497fd86a764f00e57cdd59bbbc619dafd05;p=dealii.git Make it compile. git-svn-id: https://svn.dealii.org/branches/branch_manifold_id_intermediate@33151 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/grid/tria_accessor.templates.h b/deal.II/include/deal.II/grid/tria_accessor.templates.h index 1e6ff54a0b..c75d0f5c54 100644 --- a/deal.II/include/deal.II/grid/tria_accessor.templates.h +++ b/deal.II/include/deal.II/grid/tria_accessor.templates.h @@ -1930,14 +1930,13 @@ TriaAccessor::get_manifold () const // the boundary id, after having // casted it to a manifold id if(mi == numbers::invalid_manifold_id) - mi = static_cast - (structdim < dim ? - this->objects().boundary_or_material_id[this->present_index].boundary_id: - dim < spacedim ? - this->objects().boundary_or_material_id[this->present_index].material_id: - numbers::invalid_manifold_id); - - return this->tria->get_manifold(mi); + return this->tria->get_manifold(structdim < dim ? + this->objects().boundary_or_material_id[this->present_index].boundary_id: + dim < spacedim ? + this->objects().boundary_or_material_id[this->present_index].material_id: + numbers::invalid_manifold_id); + else + this->tria->get_manifold(mi); }