From a2a8796dee99872788fb1872a4b6bc7ce168dd7e Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Mon, 2 Mar 2015 10:47:16 +0100 Subject: [PATCH] Fix compiler warnings with clang 3.6. Comparing the address of a reference to an object with the zero pointer like in &dof_handler.get_fe() != 0 will always evaluate to true. Thus, these assertions do not make sense and clang is right to complain. --- include/deal.II/dofs/dof_accessor.templates.h | 5 ---- include/deal.II/hp/dof_faces.h | 25 ------------------- source/dofs/dof_accessor.cc | 2 -- source/dofs/dof_accessor_get.cc | 2 -- source/dofs/dof_accessor_set.cc | 2 -- source/dofs/dof_tools.cc | 3 --- 6 files changed, 39 deletions(-) diff --git a/include/deal.II/dofs/dof_accessor.templates.h b/include/deal.II/dofs/dof_accessor.templates.h index fdb96cbd66..76f087f2e0 100644 --- a/include/deal.II/dofs/dof_accessor.templates.h +++ b/include/deal.II/dofs/dof_accessor.templates.h @@ -1549,7 +1549,6 @@ DoFAccessor::mg_vertex_dof_index (const int leve const unsigned int fe_index) const { Assert (this->dof_handler != 0, ExcInvalidObject ()); - Assert (&this->dof_handler->get_fe () != 0, ExcInvalidObject ()); Assert (vertex < GeometryInfo::vertices_per_cell, ExcIndexRange (vertex, 0, GeometryInfo::vertices_per_cell)); Assert (i < this->dof_handler->get_fe ()[fe_index].dofs_per_vertex, ExcIndexRange (i, 0, this->dof_handler->get_fe ()[fe_index].dofs_per_vertex)); return this->dof_handler->mg_vertex_dofs[this->vertex_index (vertex)].get_index (level, i); @@ -1583,7 +1582,6 @@ DoFAccessor::set_mg_vertex_dof_index (const int const unsigned int fe_index) const { Assert (this->dof_handler != 0, ExcInvalidObject ()); - Assert (&this->dof_handler->get_fe () != 0, ExcInvalidObject ()); Assert (vertex < GeometryInfo::vertices_per_cell, ExcIndexRange (vertex, 0, GeometryInfo::vertices_per_cell)); Assert (i < this->dof_handler->get_fe ()[fe_index].dofs_per_vertex, ExcIndexRange (i, 0, this->dof_handler->get_fe ()[fe_index].dofs_per_vertex)); this->dof_handler->mg_vertex_dofs[this->vertex_index (vertex)].set_index (level, i, index); @@ -1851,7 +1849,6 @@ DoFAccessor::get_dof_indices (std::vectordof_handler != 0, ExcNotInitialized()); - Assert (&this->dof_handler->get_fe() != 0, ExcMessage ("DoFHandler not initialized")); Assert (static_cast(this->level()) < this->dof_handler->levels.size(), ExcMessage ("DoFHandler not initialized")); @@ -1914,7 +1911,6 @@ void DoFAccessor::get_mg_dof_indices (const int const unsigned int fe_index) const { Assert (this->dof_handler != 0, ExcInvalidObject ()); - Assert (&this->dof_handler->get_fe () != 0, ExcInvalidObject ()); switch (structdim) { @@ -1966,7 +1962,6 @@ void DoFAccessor::set_mg_dof_indices (const int const unsigned int fe_index) { Assert (this->dof_handler != 0, ExcInvalidObject ()); - Assert (&this->dof_handler->get_fe () != 0, ExcInvalidObject ()); switch (structdim) { diff --git a/include/deal.II/hp/dof_faces.h b/include/deal.II/hp/dof_faces.h index b4c0598318..def3ec380a 100644 --- a/include/deal.II/hp/dof_faces.h +++ b/include/deal.II/hp/dof_faces.h @@ -371,11 +371,6 @@ namespace internal Assert ((fe_index != dealii::hp::DoFHandler::default_fe_index), ExcMessage ("You need to specify a FE index when working " "with hp DoFHandlers")); - Assert (&dof_handler != 0, - ExcMessage ("No DoFHandler is specified for this iterator")); - Assert (&dof_handler.get_fe() != 0, - ExcMessage ("No finite element collection is associated with " - "this DoFHandler")); Assert (fe_index < dof_handler.get_fe().size(), ExcIndexRange (fe_index, 0, dof_handler.get_fe().size())); Assert (local_index < @@ -433,11 +428,6 @@ namespace internal Assert ((fe_index != dealii::hp::DoFHandler::default_fe_index), ExcMessage ("You need to specify a FE index when working " "with hp DoFHandlers")); - Assert (&dof_handler != 0, - ExcMessage ("No DoFHandler is specified for this iterator")); - Assert (&dof_handler.get_fe() != 0, - ExcMessage ("No finite element collection is associated with " - "this DoFHandler")); Assert (fe_index < dof_handler.get_fe().size(), ExcIndexRange (fe_index, 0, dof_handler.get_fe().size())); Assert (local_index < @@ -490,11 +480,6 @@ namespace internal n_active_fe_indices (const dealii::hp::DoFHandler &dof_handler, const unsigned int obj_index) const { - Assert (&dof_handler != 0, - ExcMessage ("No DoFHandler is specified for this iterator")); - Assert (&dof_handler.get_fe() != 0, - ExcMessage ("No finite element collection is associated with " - "this DoFHandler")); Assert (obj_index < dof_offsets.size(), ExcIndexRange (obj_index, 0, dof_offsets.size())); @@ -540,11 +525,6 @@ namespace internal const unsigned int obj_index, const unsigned int n) const { - Assert (&dof_handler != 0, - ExcMessage ("No DoFHandler is specified for this iterator")); - Assert (&dof_handler.get_fe() != 0, - ExcMessage ("No finite element collection is associated with " - "this DoFHandler")); Assert (obj_index < dof_offsets.size(), ExcIndexRange (obj_index, 0, dof_offsets.size())); @@ -601,11 +581,6 @@ namespace internal const unsigned int fe_index, const unsigned int obj_level) const { - Assert (&dof_handler != 0, - ExcMessage ("No DoFHandler is specified for this iterator")); - Assert (&dof_handler.get_fe() != 0, - ExcMessage ("No finite element collection is associated with " - "this DoFHandler")); Assert (obj_index < dof_offsets.size(), ExcIndexRange (obj_index, 0, static_cast(dof_offsets.size()))); Assert ((fe_index != dealii::hp::DoFHandler::default_fe_index), diff --git a/source/dofs/dof_accessor.cc b/source/dofs/dof_accessor.cc index 450d638aa8..2cb1726e03 100644 --- a/source/dofs/dof_accessor.cc +++ b/source/dofs/dof_accessor.cc @@ -49,7 +49,6 @@ DoFCellAccessor::update_cell_dof_indices_cache () const ExcMessage ("DoFHandler not initialized")); Assert (this->dof_handler != 0, typename BaseClass::ExcInvalidObject()); - Assert (&this->get_fe() != 0, typename BaseClass::ExcInvalidObject()); internal::DoFCellAccessor::Implementation:: update_cell_dof_indices_cache (*this); @@ -65,7 +64,6 @@ DoFCellAccessor::set_dof_indices (const std::vectordof_handler != 0, typename BaseClass::ExcInvalidObject()); - Assert (&this->get_fe() != 0, typename BaseClass::ExcInvalidObject()); internal::DoFCellAccessor::Implementation:: set_dof_indices (*this, local_dof_indices); diff --git a/source/dofs/dof_accessor_get.cc b/source/dofs/dof_accessor_get.cc index b0e96f099a..2465435e61 100644 --- a/source/dofs/dof_accessor_get.cc +++ b/source/dofs/dof_accessor_get.cc @@ -103,8 +103,6 @@ get_interpolated_dof_values (const InputVector &values, Assert (this->dof_handler != 0, typename BaseClass::ExcInvalidObject()); - Assert (&fe != 0, - typename BaseClass::ExcInvalidObject()); Assert (interpolated_values.size() == dofs_per_cell, typename BaseClass::ExcVectorDoesNotMatch()); Assert (values.size() == this->dof_handler->n_dofs(), diff --git a/source/dofs/dof_accessor_set.cc b/source/dofs/dof_accessor_set.cc index be8c3dfd17..651292bb56 100644 --- a/source/dofs/dof_accessor_set.cc +++ b/source/dofs/dof_accessor_set.cc @@ -100,8 +100,6 @@ set_dof_values_by_interpolation (const Vector &local_values, Assert (this->dof_handler != 0, typename BaseClass::ExcInvalidObject()); - Assert (&this->get_dof_handler().get_fe() != 0, - typename BaseClass::ExcInvalidObject()); Assert (local_values.size() == dofs_per_cell, typename BaseClass::ExcVectorDoesNotMatch()); Assert (values.size() == this->dof_handler->n_dofs(), diff --git a/source/dofs/dof_tools.cc b/source/dofs/dof_tools.cc index f55c31b8b4..76a7a9ee4f 100644 --- a/source/dofs/dof_tools.cc +++ b/source/dofs/dof_tools.cc @@ -1545,8 +1545,6 @@ namespace DoFTools map_dof_to_boundary_indices (const DH &dof_handler, std::vector &mapping) { - Assert (&dof_handler.get_fe() != 0, ExcNoFESelected()); - mapping.clear (); mapping.insert (mapping.end(), dof_handler.n_dofs(), DH::invalid_dof_index); @@ -1587,7 +1585,6 @@ namespace DoFTools const std::set &boundary_indicators, std::vector &mapping) { - Assert (&dof_handler.get_fe() != 0, ExcNoFESelected()); Assert (boundary_indicators.find (numbers::internal_face_boundary_id) == boundary_indicators.end(), ExcInvalidBoundaryIndicator()); -- 2.39.5