From d40ac14ef3355276191ae4febf76a2869e31ce2e Mon Sep 17 00:00:00 2001 From: bangerth Date: Tue, 6 Apr 2010 04:09:58 +0000 Subject: [PATCH] Disambiguate comparison with 0 for gcc 4.5. git-svn-id: https://svn.dealii.org/trunk@20943 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/dofs/dof_tools.cc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/deal.II/deal.II/source/dofs/dof_tools.cc b/deal.II/deal.II/source/dofs/dof_tools.cc index 3366c7b682..15fcc3f5ea 100644 --- a/deal.II/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/deal.II/source/dofs/dof_tools.cc @@ -1329,7 +1329,7 @@ namespace internal const FullMatrix &face_interpolation_matrix, std_cxx1x::shared_ptr > &master_dof_mask) { - if (master_dof_mask == 0) + if (master_dof_mask == std_cxx1x::shared_ptr >()) { master_dof_mask = std_cxx1x::shared_ptr > (new std::vector (fe1.dofs_per_face)); @@ -1356,7 +1356,7 @@ namespace internal const FiniteElement &fe2, std_cxx1x::shared_ptr > &matrix) { - if (matrix == 0) + if (matrix == std_cxx1x::shared_ptr >()) { matrix = std_cxx1x::shared_ptr > (new FullMatrix (fe2.dofs_per_face, @@ -1379,7 +1379,7 @@ namespace internal const unsigned int subface, std_cxx1x::shared_ptr > &matrix) { - if (matrix == 0) + if (matrix == std_cxx1x::shared_ptr >()) { matrix = std_cxx1x::shared_ptr > (new FullMatrix (fe2.dofs_per_face, @@ -1412,7 +1412,8 @@ namespace internal static_cast(face_interpolation_matrix.n()), ExcInternalError()); - if (split_matrix == 0) + if (split_matrix == + std_cxx1x::shared_ptr,FullMatrix > >()) { split_matrix = std_cxx1x::shared_ptr,FullMatrix > > @@ -2915,7 +2916,7 @@ namespace internal const bool sort_by_blocks, std::vector &dofs_by_component) { - const dealii::hp::FECollection + const dealii::hp::FECollection fe_collection (dof.get_fe()); Assert (fe_collection.n_components() < 256, ExcNotImplemented()); Assert(dofs_by_component.size() == dof.n_dofs(), @@ -2929,7 +2930,7 @@ namespace internal (fe_collection.size()); for (unsigned int f=0; f &fe = + const FiniteElement &fe = fe_collection[f]; local_component_association[f].resize(fe.dofs_per_cell); if (sort_by_blocks == true) @@ -2987,7 +2988,7 @@ namespace internal // then loop over all cells and do // the work std::vector indices; - for (typename DH::active_cell_iterator c=dof.begin_active(); + for (typename DH::active_cell_iterator c=dof.begin_active(); c!=dof.end(); ++ c) { const unsigned int fe_index = c->active_fe_index(); -- 2.39.5