From e90ba00ddf467c253fdcfa68d1f468f92e073520 Mon Sep 17 00:00:00 2001 From: hartmann Date: Fri, 11 Jul 2008 14:55:35 +0000 Subject: [PATCH] Make it compile with icc10. git-svn-id: https://svn.dealii.org/trunk@16446 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/include/base/geometry_info.h | 7 ++++--- deal.II/deal.II/source/grid/tria.cc | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/deal.II/base/include/base/geometry_info.h b/deal.II/base/include/base/geometry_info.h index 79ca912a7c..2296ee3df8 100644 --- a/deal.II/base/include/base/geometry_info.h +++ b/deal.II/base/include/base/geometry_info.h @@ -2199,7 +2199,7 @@ inline RefinementCase RefinementCase::operator | (const RefinementCase &r) const { - return RefinementCase(value | r.value); + return RefinementCase(static_cast (value | r.value)); } @@ -2209,7 +2209,7 @@ inline RefinementCase RefinementCase::operator & (const RefinementCase &r) const { - return RefinementCase(value & r.value); + return RefinementCase(static_cast (value & r.value)); } @@ -2219,7 +2219,8 @@ inline RefinementCase RefinementCase::operator ~ () const { - return RefinementCase((~value) & RefinementPossibilities::isotropic_refinement); + return RefinementCase(static_cast ( + (~value) & RefinementPossibilities::isotropic_refinement)); } diff --git a/deal.II/deal.II/source/grid/tria.cc b/deal.II/deal.II/source/grid/tria.cc index e17af5fadf..030d57b347 100644 --- a/deal.II/deal.II/source/grid/tria.cc +++ b/deal.II/deal.II/source/grid/tria.cc @@ -8891,13 +8891,13 @@ Triangulation<3>::execute_refinement () // first vertex is the same middle // vertex. for (unsigned int i=4; i<12; ++i) - if (lines[i]->vertex_index((i+1)%2)==hex->face(-1+i/4)->middle_vertex_index()) + if (lines[i]->vertex_index((i+1)%2)==hex->face(i/4-1)->middle_vertex_index()) line_orientation_yz[i]=true; else { // it must be the other way // round then - Assert(lines[i]->vertex_index(i%2)==hex->face(-1+i/4)->middle_vertex_index(), + Assert(lines[i]->vertex_index(i%2)==hex->face(i/4-1)->middle_vertex_index(), ExcInternalError()); line_orientation_yz[i]=false; } -- 2.39.5