From 908cf64204253fb38c2ab95a80ff344b3f74dcfb Mon Sep 17 00:00:00 2001 From: Jean-Paul Pelteret Date: Wed, 23 Aug 2017 17:51:15 +0200 Subject: [PATCH] Fix some warnings for unused local typedefs --- include/deal.II/base/symmetric_tensor.h | 2 - include/deal.II/dofs/dof_accessor.templates.h | 87 +++++++++---------- 2 files changed, 39 insertions(+), 50 deletions(-) diff --git a/include/deal.II/base/symmetric_tensor.h b/include/deal.II/base/symmetric_tensor.h index 18f17d1855..92bcde3129 100644 --- a/include/deal.II/base/symmetric_tensor.h +++ b/include/deal.II/base/symmetric_tensor.h @@ -1538,7 +1538,6 @@ namespace internal perform_double_contraction (const typename SymmetricTensorAccessors::StorageType<2,dim,Number>::base_tensor_type &data, const typename SymmetricTensorAccessors::StorageType<4,dim,OtherNumber>::base_tensor_type &sdata) { - typedef typename SymmetricTensorAccessors::double_contraction_result<2,4,dim,Number,OtherNumber>::type result_type; typedef typename SymmetricTensorAccessors::double_contraction_result<2,4,dim,Number,OtherNumber>::value_type value_type; typedef typename SymmetricTensorAccessors::StorageType<2,dim,value_type>::base_tensor_type base_tensor_type; @@ -1569,7 +1568,6 @@ namespace internal perform_double_contraction (const typename SymmetricTensorAccessors::StorageType<4,dim,Number>::base_tensor_type &data, const typename SymmetricTensorAccessors::StorageType<4,dim,OtherNumber>::base_tensor_type &sdata) { - typedef typename SymmetricTensorAccessors::double_contraction_result<4,4,dim,Number,OtherNumber>::type result_type; typedef typename SymmetricTensorAccessors::double_contraction_result<4,4,dim,Number,OtherNumber>::value_type value_type; typedef typename SymmetricTensorAccessors::StorageType<4,dim,value_type>::base_tensor_type base_tensor_type; diff --git a/include/deal.II/dofs/dof_accessor.templates.h b/include/deal.II/dofs/dof_accessor.templates.h index e8c442ccc9..9f315226c7 100644 --- a/include/deal.II/dofs/dof_accessor.templates.h +++ b/include/deal.II/dofs/dof_accessor.templates.h @@ -3075,8 +3075,8 @@ namespace internal (void)i; // ::DoFHandler only supports a single active fe with index // zero - typedef dealii::DoFAccessor, level_dof_access> BaseClass; - Assert (i == 0, typename BaseClass::ExcInvalidObject()); + Assert (i == 0, + (typename dealii::DoFAccessor, level_dof_access>::ExcInvalidObject())); } @@ -3087,9 +3087,8 @@ namespace internal set_active_fe_index (const DoFCellAccessor, level_dof_access> &accessor, const unsigned int i) { - typedef dealii::DoFAccessor, level_dof_access> BaseClass; Assert (accessor.dof_handler != nullptr, - typename BaseClass::ExcInvalidObject()); + (typename DoFCellAccessor, level_dof_access>::ExcInvalidObject())); Assert (static_cast(accessor.level()) < accessor.dof_handler->levels.size(), ExcMessage ("DoFHandler not initialized")); @@ -3108,15 +3107,14 @@ namespace internal ForwardIterator local_source_end, OutputVector &global_destination) { - typedef dealii::DoFAccessor, level_dof_access> BaseClass; Assert (accessor.dof_handler != nullptr, - typename BaseClass::ExcInvalidObject()); + (typename DoFCellAccessor, level_dof_access>::ExcInvalidObject())); Assert (static_cast(local_source_end-local_source_begin) == accessor.get_fe().dofs_per_cell, - typename BaseClass::ExcVectorDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcVectorDoesNotMatch())); Assert (accessor.dof_handler->n_dofs() == global_destination.size(), - typename BaseClass::ExcVectorDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcVectorDoesNotMatch())); Assert (!accessor.has_children(), ExcMessage ("Cell must be active")); @@ -3140,13 +3138,12 @@ namespace internal ForwardIterator local_source_end, OutputVector &global_destination) { - typedef dealii::DoFAccessor, level_dof_access> BaseClass; Assert (accessor.dof_handler != 0, - typename BaseClass::ExcInvalidObject()); + (typename DoFCellAccessor, level_dof_access>::ExcInvalidObject())); Assert (local_source_end-local_source_begin == accessor.get_fe().dofs_per_cell, - typename BaseClass::ExcVectorDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcVectorDoesNotMatch())); Assert (accessor.dof_handler->n_dofs() == global_destination.size(), - typename BaseClass::ExcVectorDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcVectorDoesNotMatch())); const unsigned int n_dofs = local_source_end - local_source_begin; @@ -3171,13 +3168,12 @@ namespace internal ForwardIterator local_source_end, OutputVector &global_destination) { - typedef dealii::DoFAccessor, level_dof_access> BaseClass; Assert (accessor.dof_handler != 0, - typename BaseClass::ExcInvalidObject()); + (typename DoFCellAccessor, level_dof_access>::ExcInvalidObject())); Assert (local_source_end-local_source_begin == accessor.get_fe().dofs_per_cell, - typename BaseClass::ExcVectorDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcVectorDoesNotMatch())); Assert (accessor.dof_handler->n_dofs() == global_destination.size(), - typename BaseClass::ExcVectorDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcVectorDoesNotMatch())); Assert (!accessor.has_children(), ExcMessage ("Cell must be active.")); @@ -3203,13 +3199,12 @@ namespace internal ForwardIterator local_source_end, OutputVector &global_destination) { - typedef dealii::DoFAccessor, level_dof_access> BaseClass; Assert (accessor.dof_handler != 0, - typename BaseClass::ExcInvalidObject()); + (typename DoFCellAccessor, level_dof_access>::ExcInvalidObject())); Assert (local_source_end-local_source_begin == accessor.get_fe().dofs_per_cell, - typename BaseClass::ExcVectorDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcVectorDoesNotMatch())); Assert (accessor.dof_handler->n_dofs() == global_destination.size(), - typename BaseClass::ExcVectorDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcVectorDoesNotMatch())); const unsigned int n_dofs = local_source_end - local_source_begin; @@ -3233,17 +3228,16 @@ namespace internal const dealii::FullMatrix &local_source, OutputMatrix &global_destination) { - typedef dealii::DoFAccessor, level_dof_access> BaseClass; Assert (accessor.dof_handler != nullptr, - typename BaseClass::ExcInvalidObject()); + (typename DoFCellAccessor, level_dof_access>::ExcInvalidObject())); Assert (local_source.m() == accessor.get_fe().dofs_per_cell, - typename BaseClass::ExcMatrixDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcMatrixDoesNotMatch())); Assert (local_source.n() == accessor.get_fe().dofs_per_cell, - typename BaseClass::ExcMatrixDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcMatrixDoesNotMatch())); Assert (accessor.dof_handler->n_dofs() == global_destination.m(), - typename BaseClass::ExcMatrixDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcMatrixDoesNotMatch())); Assert (accessor.dof_handler->n_dofs() == global_destination.n(), - typename BaseClass::ExcMatrixDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcMatrixDoesNotMatch())); Assert (!accessor.has_children(), ExcMessage ("Cell must be active.")); @@ -3268,17 +3262,16 @@ namespace internal const dealii::FullMatrix &local_source, OutputMatrix &global_destination) { - typedef dealii::DoFAccessor, level_dof_access> BaseClass; Assert (accessor.dof_handler != 0, - typename BaseClass::ExcInvalidObject()); + (typename DoFCellAccessor, level_dof_access>::ExcInvalidObject())); Assert (local_source.m() == accessor.get_fe().dofs_per_cell, - typename BaseClass::ExcMatrixDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcMatrixDoesNotMatch())); Assert (local_source.n() == accessor.get_fe().dofs_per_cell, - typename BaseClass::ExcVectorDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcVectorDoesNotMatch())); Assert (accessor.dof_handler->n_dofs() == global_destination.m(), - typename BaseClass::ExcMatrixDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcMatrixDoesNotMatch())); Assert (accessor.dof_handler->n_dofs() == global_destination.n(), - typename BaseClass::ExcMatrixDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcMatrixDoesNotMatch())); const unsigned int n_dofs = local_source.size(); @@ -3304,21 +3297,20 @@ namespace internal OutputMatrix &global_matrix, OutputVector &global_vector) { - typedef dealii::DoFAccessor, level_dof_access> BaseClass; Assert (accessor.dof_handler != 0, - typename BaseClass::ExcInvalidObject()); + (typename DoFCellAccessor, level_dof_access>::ExcInvalidObject())); Assert (local_matrix.m() == accessor.get_fe().dofs_per_cell, - typename BaseClass::ExcMatrixDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcMatrixDoesNotMatch())); Assert (local_matrix.n() == accessor.get_fe().dofs_per_cell, - typename BaseClass::ExcVectorDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcVectorDoesNotMatch())); Assert (accessor.dof_handler->n_dofs() == global_matrix.m(), - typename BaseClass::ExcMatrixDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcMatrixDoesNotMatch())); Assert (accessor.dof_handler->n_dofs() == global_matrix.n(), - typename BaseClass::ExcMatrixDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcMatrixDoesNotMatch())); Assert (local_vector.size() == accessor.get_fe().dofs_per_cell, - typename BaseClass::ExcVectorDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcVectorDoesNotMatch())); Assert (accessor.dof_handler->n_dofs() == global_vector.size(), - typename BaseClass::ExcVectorDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcVectorDoesNotMatch())); Assert (!accessor.has_children(), ExcMessage ("Cell must be active.")); @@ -3347,21 +3339,20 @@ namespace internal OutputMatrix &global_matrix, OutputVector &global_vector) { - typedef dealii::DoFAccessor, level_dof_access> BaseClass; Assert (accessor.dof_handler != 0, - typename BaseClass::ExcInvalidObject()); + (typename DoFCellAccessor, level_dof_access>::ExcInvalidObject())); Assert (local_matrix.m() == accessor.get_fe().dofs_per_cell, - typename BaseClass::ExcMatrixDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcMatrixDoesNotMatch())); Assert (local_matrix.n() == accessor.get_fe().dofs_per_cell, - typename BaseClass::ExcVectorDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcVectorDoesNotMatch())); Assert (accessor.dof_handler->n_dofs() == global_matrix.m(), - typename BaseClass::ExcMatrixDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcMatrixDoesNotMatch())); Assert (accessor.dof_handler->n_dofs() == global_matrix.n(), - typename BaseClass::ExcMatrixDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcMatrixDoesNotMatch())); Assert (local_vector.size() == accessor.get_fe().dofs_per_cell, - typename BaseClass::ExcVectorDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcVectorDoesNotMatch())); Assert (accessor.dof_handler->n_dofs() == global_vector.size(), - typename BaseClass::ExcVectorDoesNotMatch()); + (typename DoFCellAccessor, level_dof_access>::ExcVectorDoesNotMatch())); const unsigned int n_dofs = local_matrix.size(); -- 2.39.5