From: Wolfgang Bangerth Date: Fri, 12 Jun 2009 08:53:35 +0000 (+0000) Subject: Use 'CellSimilarity::Similarity' instead of 'enum CellSimilarity::Similarity' to... X-Git-Tag: v8.0.0~7616 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c39164e7dcb9e7bbdef7deb928d03b7a4b46c754;p=dealii.git Use 'CellSimilarity::Similarity' instead of 'enum CellSimilarity::Similarity' to work around some annoying problem with gcc3.3.1. git-svn-id: https://svn.dealii.org/trunk@18933 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/fe/fe.h b/deal.II/deal.II/include/fe/fe.h index 0d8a1a035f..ac61e81062 100644 --- a/deal.II/deal.II/include/fe/fe.h +++ b/deal.II/deal.II/include/fe/fe.h @@ -2594,7 +2594,7 @@ class FiniteElement : public Subscriptor, typename Mapping::InternalDataBase &mapping_internal, typename Mapping::InternalDataBase &fe_internal, FEValuesData &data, - enum CellSimilarity::Similarity &cell_similarity) const = 0; + CellSimilarity::Similarity &cell_similarity) const = 0; /** * Fill the fields of diff --git a/deal.II/deal.II/include/fe/fe_dgp_nonparametric.h b/deal.II/deal.II/include/fe/fe_dgp_nonparametric.h index 75fe93f390..f0890fa8a1 100644 --- a/deal.II/deal.II/include/fe/fe_dgp_nonparametric.h +++ b/deal.II/deal.II/include/fe/fe_dgp_nonparametric.h @@ -484,7 +484,7 @@ class FE_DGPNonparametric : public FiniteElement typename Mapping::InternalDataBase &mapping_internal, typename Mapping::InternalDataBase &fe_internal, FEValuesData &data, - enum CellSimilarity::Similarity &cell_similarity) const; + CellSimilarity::Similarity &cell_similarity) const; /** * Implementation of the same diff --git a/deal.II/deal.II/include/fe/fe_nedelec.h b/deal.II/deal.II/include/fe/fe_nedelec.h index ed790b721f..4752213786 100644 --- a/deal.II/deal.II/include/fe/fe_nedelec.h +++ b/deal.II/deal.II/include/fe/fe_nedelec.h @@ -418,7 +418,7 @@ class FE_Nedelec : public FiniteElement typename Mapping::InternalDataBase &mapping_internal, typename Mapping::InternalDataBase &fe_internal, FEValuesData &data, - enum CellSimilarity::Similarity &cell_similarity) const; + CellSimilarity::Similarity &cell_similarity) const; /** * Implementation of the same diff --git a/deal.II/deal.II/include/fe/fe_poly.h b/deal.II/deal.II/include/fe/fe_poly.h index a8f4228660..44a549144f 100644 --- a/deal.II/deal.II/include/fe/fe_poly.h +++ b/deal.II/deal.II/include/fe/fe_poly.h @@ -224,7 +224,7 @@ class FE_Poly : public FiniteElement typename Mapping::InternalDataBase &mapping_internal, typename Mapping::InternalDataBase &fe_internal, FEValuesData &data, - enum CellSimilarity::Similarity &cell_similarity) const; + CellSimilarity::Similarity &cell_similarity) const; virtual void fill_fe_face_values (const Mapping &mapping, diff --git a/deal.II/deal.II/include/fe/fe_poly.templates.h b/deal.II/deal.II/include/fe/fe_poly.templates.h index d99571c016..f75abfb8b6 100644 --- a/deal.II/deal.II/include/fe/fe_poly.templates.h +++ b/deal.II/deal.II/include/fe/fe_poly.templates.h @@ -245,7 +245,7 @@ FE_Poly,1,2>::fill_fe_values Mapping<1,2>::InternalDataBase &mapping_data, Mapping<1,2>::InternalDataBase &fedata, FEValuesData<1,2> &data, - enum CellSimilarity::Similarity &cell_similarity) const + CellSimilarity::Similarity &cell_similarity) const { // convert data object to internal // data for this class. fails with @@ -288,7 +288,7 @@ FE_Poly,2,3>::fill_fe_values Mapping<2,3>::InternalDataBase &mapping_data, Mapping<2,3>::InternalDataBase &fedata, FEValuesData<2,3> &data, - enum CellSimilarity::Similarity &cell_similarity) const + CellSimilarity::Similarity &cell_similarity) const { // assert that the following dynamics @@ -330,7 +330,7 @@ FE_Poly,1,2>::fill_fe_values ( Mapping<1,2>::InternalDataBase &mapping_data, Mapping<1,2>::InternalDataBase &fedata, FEValuesData<1,2> &data, - enum CellSimilarity::Similarity &cell_similarity) const + CellSimilarity::Similarity &cell_similarity) const { // convert data object to internal // data for this class. fails with @@ -375,7 +375,7 @@ FE_Poly,2,3>::fill_fe_values Mapping<2,3>::InternalDataBase &mapping_data, Mapping<2,3>::InternalDataBase &fedata, FEValuesData<2,3> &data, - enum CellSimilarity::Similarity &cell_similarity) const + CellSimilarity::Similarity &cell_similarity) const { Assert (dynamic_cast (&fedata) != 0, ExcInternalError()); InternalData &fe_data = static_cast (fedata); @@ -414,7 +414,7 @@ FE_Poly::fill_fe_values typename Mapping::InternalDataBase &mapping_data, typename Mapping::InternalDataBase &fedata, FEValuesData &data, - enum CellSimilarity::Similarity &cell_similarity) const + CellSimilarity::Similarity &cell_similarity) const { // convert data object to internal // data for this class. fails with diff --git a/deal.II/deal.II/include/fe/fe_poly_tensor.h b/deal.II/deal.II/include/fe/fe_poly_tensor.h index afd36801c7..4eae2179e9 100644 --- a/deal.II/deal.II/include/fe/fe_poly_tensor.h +++ b/deal.II/deal.II/include/fe/fe_poly_tensor.h @@ -240,7 +240,7 @@ class FE_PolyTensor : public FiniteElement typename Mapping::InternalDataBase &mapping_internal, typename Mapping::InternalDataBase &fe_internal, FEValuesData &data, - enum CellSimilarity::Similarity &cell_similarity) const; + CellSimilarity::Similarity &cell_similarity) const; virtual void fill_fe_face_values (const Mapping &mapping, diff --git a/deal.II/deal.II/include/fe/fe_system.h b/deal.II/deal.II/include/fe/fe_system.h index 349c0ae072..a1de9d84ed 100644 --- a/deal.II/deal.II/include/fe/fe_system.h +++ b/deal.II/deal.II/include/fe/fe_system.h @@ -615,7 +615,7 @@ class FESystem : public FiniteElement typename Mapping::InternalDataBase &mapping_data, typename Mapping::InternalDataBase &fe_data, FEValuesData &data, - enum CellSimilarity::Similarity &cell_similarity) const; + CellSimilarity::Similarity &cell_similarity) const; /** * Implementation of the same @@ -685,7 +685,7 @@ class FESystem : public FiniteElement const unsigned int face_no, const unsigned int sub_no, const Quadrature &quadrature, - enum CellSimilarity::Similarity cell_similarity, + CellSimilarity::Similarity cell_similarity, typename Mapping::InternalDataBase &mapping_data, typename Mapping::InternalDataBase &fe_data, FEValuesData &data) const ; diff --git a/deal.II/deal.II/include/fe/mapping.h b/deal.II/deal.II/include/fe/mapping.h index ca4b219cd2..ad7c193492 100644 --- a/deal.II/deal.II/include/fe/mapping.h +++ b/deal.II/deal.II/include/fe/mapping.h @@ -553,7 +553,7 @@ class Mapping : public Subscriptor std::vector > &jacobian_grads, std::vector > &inverse_jacobians, std::vector > &cell_normal_vectors, - enum CellSimilarity::Similarity &cell_similarity + CellSimilarity::Similarity &cell_similarity ) const=0; diff --git a/deal.II/deal.II/include/fe/mapping_cartesian.h b/deal.II/deal.II/include/fe/mapping_cartesian.h index 709a830abc..8fa505d91a 100644 --- a/deal.II/deal.II/include/fe/mapping_cartesian.h +++ b/deal.II/deal.II/include/fe/mapping_cartesian.h @@ -68,7 +68,7 @@ class MappingCartesian : public Mapping std::vector > &jacobian_grads, std::vector > &inverse_jacobians, std::vector > &, - enum CellSimilarity::Similarity &cell_similarity) const ; + CellSimilarity::Similarity &cell_similarity) const ; virtual void @@ -181,7 +181,7 @@ class MappingCartesian : public Mapping void compute_fill (const typename Triangulation::cell_iterator &cell, const unsigned int face_no, const unsigned int sub_no, - const enum CellSimilarity::Similarity cell_similarity, + const CellSimilarity::Similarity cell_similarity, InternalData& data, std::vector > &quadrature_points, std::vector >& normal_vectors) const; diff --git a/deal.II/deal.II/include/fe/mapping_q.h b/deal.II/deal.II/include/fe/mapping_q.h index 3860fac6c4..deb56a34f1 100644 --- a/deal.II/deal.II/include/fe/mapping_q.h +++ b/deal.II/deal.II/include/fe/mapping_q.h @@ -212,7 +212,7 @@ class MappingQ : public MappingQ1 std::vector > &jacobian_grads, std::vector > &inverse_jacobians, std::vector > &cell_normal_vectors, - enum CellSimilarity::Similarity &cell_similarity) const ; + CellSimilarity::Similarity &cell_similarity) const ; /** * Implementation of the interface in diff --git a/deal.II/deal.II/include/fe/mapping_q1.h b/deal.II/deal.II/include/fe/mapping_q1.h index ea81d72fd2..8df810df35 100644 --- a/deal.II/deal.II/include/fe/mapping_q1.h +++ b/deal.II/deal.II/include/fe/mapping_q1.h @@ -302,7 +302,7 @@ class MappingQ1 : public Mapping std::vector > &jacobian_grads, std::vector > &inverse_jacobians, std::vector > &cell_normal_vectors, - enum CellSimilarity::Similarity &cell_similarity) const; + CellSimilarity::Similarity &cell_similarity) const; /** * Implementation of the interface in @@ -385,7 +385,7 @@ class MappingQ1 : public Mapping void compute_fill (const typename Triangulation::cell_iterator &cell, const unsigned int npts, const DataSetDescriptor data_set, - const enum CellSimilarity::Similarity cell_similarity, + const CellSimilarity::Similarity cell_similarity, InternalData &data, std::vector > &quadrature_points) const; diff --git a/deal.II/deal.II/include/fe/mapping_q1_eulerian.h b/deal.II/deal.II/include/fe/mapping_q1_eulerian.h index 6ac156bb14..c8f4f6a0e1 100644 --- a/deal.II/deal.II/include/fe/mapping_q1_eulerian.h +++ b/deal.II/deal.II/include/fe/mapping_q1_eulerian.h @@ -159,7 +159,7 @@ class MappingQ1Eulerian : public MappingQ1 std::vector > &jacobian_grads, std::vector > &inverse_jacobians, std::vector > &cell_normal_vectors, - enum CellSimilarity::Similarity &cell_similarity) const; + CellSimilarity::Similarity &cell_similarity) const; /** * Reference to the vector of diff --git a/deal.II/deal.II/include/fe/mapping_q_eulerian.h b/deal.II/deal.II/include/fe/mapping_q_eulerian.h index 6bb053388e..f4d3529b97 100644 --- a/deal.II/deal.II/include/fe/mapping_q_eulerian.h +++ b/deal.II/deal.II/include/fe/mapping_q_eulerian.h @@ -162,7 +162,7 @@ class MappingQEulerian : public MappingQ std::vector > &jacobian_grads, std::vector > &inverse_jacobians, std::vector > &cell_normal_vectors, - enum CellSimilarity::Similarity &cell_similarity) const; + CellSimilarity::Similarity &cell_similarity) const; /** * Reference to the vector of diff --git a/deal.II/deal.II/source/fe/fe_dgp_nonparametric.cc b/deal.II/deal.II/source/fe/fe_dgp_nonparametric.cc index 71cba1c8bc..369d8ba1c6 100644 --- a/deal.II/deal.II/source/fe/fe_dgp_nonparametric.cc +++ b/deal.II/deal.II/source/fe/fe_dgp_nonparametric.cc @@ -292,7 +292,7 @@ FE_DGPNonparametric::fill_fe_values ( typename Mapping::InternalDataBase&, typename Mapping::InternalDataBase& fedata, FEValuesData&data, - enum CellSimilarity::Similarity &/*cell_similarity*/) const + CellSimilarity::Similarity &/*cell_similarity*/) const { // convert data object to internal // data for this class. fails with diff --git a/deal.II/deal.II/source/fe/fe_nedelec.cc b/deal.II/deal.II/source/fe/fe_nedelec.cc index e6639c46f9..cd958fbb23 100644 --- a/deal.II/deal.II/source/fe/fe_nedelec.cc +++ b/deal.II/deal.II/source/fe/fe_nedelec.cc @@ -997,7 +997,7 @@ FE_Nedelec::fill_fe_values typename Mapping::InternalDataBase &mapping_data, typename Mapping::InternalDataBase &fedata, FEValuesData &data, - enum CellSimilarity::Similarity &/*cell_similarity*/) const + CellSimilarity::Similarity &/*cell_similarity*/) const { // convert data object to internal // data for this class. fails with diff --git a/deal.II/deal.II/source/fe/fe_poly_tensor.cc b/deal.II/deal.II/source/fe/fe_poly_tensor.cc index 9abae0427a..8b1b92a8bd 100644 --- a/deal.II/deal.II/source/fe/fe_poly_tensor.cc +++ b/deal.II/deal.II/source/fe/fe_poly_tensor.cc @@ -373,7 +373,7 @@ FE_PolyTensor::fill_fe_values ( typename Mapping::InternalDataBase &mapping_data, typename Mapping::InternalDataBase &fedata, FEValuesData &data, - enum CellSimilarity::Similarity &cell_similarity) const + CellSimilarity::Similarity &cell_similarity) const { // convert data object to internal // data for this class. fails with diff --git a/deal.II/deal.II/source/fe/fe_system.cc b/deal.II/deal.II/source/fe/fe_system.cc index 8acc18e68d..94843f74ab 100644 --- a/deal.II/deal.II/source/fe/fe_system.cc +++ b/deal.II/deal.II/source/fe/fe_system.cc @@ -670,7 +670,7 @@ fill_fe_values (const Mapping &mapping, typename Mapping::InternalDataBase &mapping_data, typename Mapping::InternalDataBase &fe_data, FEValuesData &data, - enum CellSimilarity::Similarity &cell_similarity) const + CellSimilarity::Similarity &cell_similarity) const { compute_fill(mapping, cell, invalid_face_number, invalid_face_number, quadrature, cell_similarity, mapping_data, fe_data, data); @@ -723,7 +723,7 @@ compute_fill (const Mapping &mapping, const unsigned int face_no, const unsigned int sub_no, const Quadrature &quadrature, - enum CellSimilarity::Similarity cell_similarity, + CellSimilarity::Similarity cell_similarity, typename Mapping::InternalDataBase &mapping_data, typename Mapping::InternalDataBase &fedata, FEValuesData &data) const diff --git a/deal.II/deal.II/source/fe/mapping_cartesian.cc b/deal.II/deal.II/source/fe/mapping_cartesian.cc index acdfc8b32f..39196105ab 100644 --- a/deal.II/deal.II/source/fe/mapping_cartesian.cc +++ b/deal.II/deal.II/source/fe/mapping_cartesian.cc @@ -132,7 +132,7 @@ void MappingCartesian::compute_fill (const typename Triangulation::cell_iterator &cell, const unsigned int face_no, const unsigned int sub_no, - const enum CellSimilarity::Similarity cell_similarity, + const CellSimilarity::Similarity cell_similarity, InternalData &data, std::vector > &quadrature_points, std::vector > &normal_vectors) const @@ -310,7 +310,7 @@ fill_fe_values (const typename Triangulation::cell_iterator& cell, std::vector >& jacobian_grads, std::vector >& inverse_jacobians, std::vector > &, - enum CellSimilarity::Similarity& cell_similarity) const + CellSimilarity::Similarity& cell_similarity) const { // convert data object to internal // data for this class. fails with diff --git a/deal.II/deal.II/source/fe/mapping_q.cc b/deal.II/deal.II/source/fe/mapping_q.cc index cea0b4f45c..a77a6b8c84 100644 --- a/deal.II/deal.II/source/fe/mapping_q.cc +++ b/deal.II/deal.II/source/fe/mapping_q.cc @@ -314,7 +314,7 @@ MappingQ::fill_fe_values ( std::vector > &jacobian_grads, std::vector > &inverse_jacobians, std::vector > &cell_normal_vectors, - enum CellSimilarity::Similarity &cell_similarity) const + CellSimilarity::Similarity &cell_similarity) const { // convert data object to internal // data for this class. fails with diff --git a/deal.II/deal.II/source/fe/mapping_q1.cc b/deal.II/deal.II/source/fe/mapping_q1.cc index b2f07faa87..ca0f2c818a 100644 --- a/deal.II/deal.II/source/fe/mapping_q1.cc +++ b/deal.II/deal.II/source/fe/mapping_q1.cc @@ -606,7 +606,7 @@ void MappingQ1::compute_fill (const typename Triangulation::cell_iterator &cell, const unsigned int n_q_points, const DataSetDescriptor data_set, - const enum CellSimilarity::Similarity cell_similarity, + const CellSimilarity::Similarity cell_similarity, InternalData &data, std::vector > &quadrature_points) const { @@ -745,7 +745,7 @@ MappingQ1::fill_fe_values ( std::vector > &jacobian_grads, std::vector > &inverse_jacobians, std::vector > &cell_normal_vectors, - enum CellSimilarity::Similarity &cell_similarity) const + CellSimilarity::Similarity &cell_similarity) const { // ensure that the following cast is really correct: Assert (dynamic_cast(&mapping_data) != 0, diff --git a/deal.II/deal.II/source/fe/mapping_q1_eulerian.cc b/deal.II/deal.II/source/fe/mapping_q1_eulerian.cc index 4444b1bab8..006e9dc0b8 100644 --- a/deal.II/deal.II/source/fe/mapping_q1_eulerian.cc +++ b/deal.II/deal.II/source/fe/mapping_q1_eulerian.cc @@ -127,7 +127,7 @@ MappingQ1Eulerian::fill_fe_values ( std::vector > &jacobian_grads, std::vector > &inverse_jacobians, std::vector > &cell_normal_vectors, - enum CellSimilarity::Similarity &cell_similarity) const + CellSimilarity::Similarity &cell_similarity) const { // disable any previously detected // similarity and then enter the diff --git a/deal.II/deal.II/source/fe/mapping_q_eulerian.cc b/deal.II/deal.II/source/fe/mapping_q_eulerian.cc index 568f9845fb..283d074019 100644 --- a/deal.II/deal.II/source/fe/mapping_q_eulerian.cc +++ b/deal.II/deal.II/source/fe/mapping_q_eulerian.cc @@ -194,7 +194,7 @@ MappingQEulerian::fill_fe_values ( std::vector > &jacobian_grads, std::vector > &inverse_jacobians, std::vector > &cell_normal_vectors, - enum CellSimilarity::Similarity &cell_similarity) const + CellSimilarity::Similarity &cell_similarity) const { // disable any previously detected // similarity and hand on to the respective