From 3a4fd00bbc89c00f926cd9e1f798e3e1a8b450b5 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Thu, 1 Oct 2009 20:10:08 +0000 Subject: [PATCH] Avoid a few warnings. git-svn-id: https://svn.dealii.org/trunk@19650 0785d39b-7218-0410-832d-ea1e28bc413d --- .../include/dofs/dof_accessor.templates.h | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/deal.II/deal.II/include/dofs/dof_accessor.templates.h b/deal.II/deal.II/include/dofs/dof_accessor.templates.h index c95b59a760..aa3bbf063e 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.templates.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.templates.h @@ -2083,7 +2083,8 @@ namespace internal ForwardIterator local_values_end) { typedef dealii::DoFAccessor > BaseClass; - Assert (local_values_end-local_values_begin == accessor.get_fe().dofs_per_cell, + Assert (static_cast(local_values_end-local_values_begin) + == accessor.get_fe().dofs_per_cell, typename BaseClass::ExcVectorDoesNotMatch()); Assert (values.size() == accessor.get_dof_handler().n_dofs(), typename BaseClass::ExcVectorDoesNotMatch()); @@ -2098,7 +2099,7 @@ namespace internal ExcMessage ("Cell must either be active, or all DoFs must be in vertices")); unsigned int *cache = &accessor.dof_handler->levels[accessor.level()] - ->cell_dof_indices_cache[accessor.present_index * + ->cell_dof_indices_cache[accessor.present_index * accessor.get_fe().dofs_per_cell]; for ( ; local_values_begin != local_values_end; ++local_values_begin, ++cache) *local_values_begin = values(*cache); @@ -2123,7 +2124,8 @@ namespace internal // no caching for hp::DoFHandler // implemented - Assert (local_values_end-local_values_begin == accessor.get_fe().dofs_per_cell, + Assert (static_cast(local_values_end-local_values_begin) + == accessor.get_fe().dofs_per_cell, typename BaseClass::ExcVectorDoesNotMatch()); const unsigned int dofs_per_cell = accessor.get_fe().dofs_per_cell; @@ -2154,7 +2156,8 @@ namespace internal ForwardIterator local_values_end) { typedef dealii::DoFAccessor > BaseClass; - Assert (local_values_end-local_values_begin == accessor.get_fe().dofs_per_cell, + Assert (static_cast(local_values_end-local_values_begin) + == accessor.get_fe().dofs_per_cell, typename BaseClass::ExcVectorDoesNotMatch()); Assert (values.size() == accessor.get_dof_handler().n_dofs(), typename BaseClass::ExcVectorDoesNotMatch()); @@ -2169,7 +2172,7 @@ namespace internal ExcMessage ("Cell must either be active, or all DoFs must be in vertices")); unsigned int *cache = &accessor.dof_handler->levels[accessor.level()] - ->cell_dof_indices_cache[accessor.present_index * + ->cell_dof_indices_cache[accessor.present_index * accessor.get_fe().dofs_per_cell]; constraints.get_dof_values(values, *cache, local_values_begin, local_values_end); @@ -2194,7 +2197,8 @@ namespace internal // no caching for hp::DoFHandler // implemented typedef dealii::DoFAccessor > BaseClass; - Assert (local_values_end-local_values_begin == accessor.get_fe().dofs_per_cell, + Assert (static_cast(local_values_end-local_values_begin) + == accessor.get_fe().dofs_per_cell, typename BaseClass::ExcVectorDoesNotMatch()); const unsigned int dofs_per_cell = accessor.get_fe().dofs_per_cell; @@ -2560,7 +2564,7 @@ namespace internal - template static void @@ -2611,7 +2615,7 @@ namespace internal - template static void @@ -2811,7 +2815,7 @@ DoFCellAccessor::get_dof_values (const ConstraintMatrix &constraints, ForwardIterator local_values_end) const { internal::DoFCellAccessor::Implementation - ::get_dof_values (*this, constraints, values, + ::get_dof_values (*this, constraints, values, local_values_begin, local_values_end); } -- 2.39.5