]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Make it compile with icc10.
authorhartmann <hartmann@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 11 Jul 2008 14:55:35 +0000 (14:55 +0000)
committerhartmann <hartmann@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 11 Jul 2008 14:55:35 +0000 (14:55 +0000)
git-svn-id: https://svn.dealii.org/trunk@16446 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/base/include/base/geometry_info.h
deal.II/deal.II/source/grid/tria.cc

index 79ca912a7ccdf43a13c046a0993c35dbb0e17629..2296ee3df8c9b30e252ab609f1516dafd14b1f49 100644 (file)
@@ -2199,7 +2199,7 @@ inline
 RefinementCase<dim>
 RefinementCase<dim>::operator | (const RefinementCase<dim> &r) const
 {
-  return RefinementCase<dim>(value | r.value);
+  return RefinementCase<dim>(static_cast<unsigned char> (value | r.value));
 }
 
 
@@ -2209,7 +2209,7 @@ inline
 RefinementCase<dim>
 RefinementCase<dim>::operator & (const RefinementCase<dim> &r) const
 {
-  return RefinementCase<dim>(value & r.value);
+  return RefinementCase<dim>(static_cast<unsigned char> (value & r.value));
 }
 
 
@@ -2219,7 +2219,8 @@ inline
 RefinementCase<dim>
 RefinementCase<dim>::operator ~ () const
 {
-  return RefinementCase<dim>((~value) & RefinementPossibilities<dim>::isotropic_refinement);
+  return RefinementCase<dim>(static_cast<unsigned char> (
+                              (~value) & RefinementPossibilities<dim>::isotropic_refinement));
 }
 
 
index e17af5fadf691ff8a06f92febfb54a7691986949..030d57b347d61b14e6fcb30c7115e9183ba5b474 100644 (file)
@@ -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;
                      }

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.