From 19e2ac289cdd6206973d029e3a1a1cf1f2c559b2 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Thu, 6 Aug 2015 15:26:09 -0500 Subject: [PATCH] Windows porting: Minor namespace changes --- include/deal.II/fe/fe.h | 62 ++++++++++++++++----------------- include/deal.II/fe/fe_values.h | 4 +-- include/deal.II/fe/mapping.h | 32 ++++++++--------- include/deal.II/fe/mapping_q1.h | 32 ++++++++--------- 4 files changed, 65 insertions(+), 65 deletions(-) diff --git a/include/deal.II/fe/fe.h b/include/deal.II/fe/fe.h index 189bb3f68b..aa810683d3 100644 --- a/include/deal.II/fe/fe.h +++ b/include/deal.II/fe/fe.h @@ -1969,12 +1969,12 @@ protected: /** * Compute second derivatives by finite differences of gradients. */ - void compute_2nd (const Mapping &mapping, - const typename Triangulation::cell_iterator &cell, - const unsigned int offset, - const typename Mapping::InternalDataBase &mapping_internal, - const InternalDataBase &fe_internal, - internal::FEValues::FiniteElementRelatedData &data) const; + void compute_2nd (const Mapping &mapping, + const typename Triangulation::cell_iterator &cell, + const unsigned int offset, + const typename Mapping::InternalDataBase &mapping_internal, + const InternalDataBase &fe_internal, + dealii::internal::FEValues::FiniteElementRelatedData &data) const; /** * Given the pattern of nonzero components for each shape function, compute @@ -2052,37 +2052,37 @@ protected: virtual void - fill_fe_values (const Mapping &mapping, - const typename Triangulation::cell_iterator &cell, - const Quadrature &quadrature, - const typename Mapping::InternalDataBase &mapping_internal, - const typename Mapping::InternalDataBase &fe_internal, - const internal::FEValues::MappingRelatedData &mapping_data, - internal::FEValues::FiniteElementRelatedData &output_data, - const CellSimilarity::Similarity cell_similarity) const = 0; + fill_fe_values (const Mapping &mapping, + const typename Triangulation::cell_iterator &cell, + const Quadrature &quadrature, + const typename Mapping::InternalDataBase &mapping_internal, + const typename Mapping::InternalDataBase &fe_internal, + const dealii::internal::FEValues::MappingRelatedData &mapping_data, + dealii::internal::FEValues::FiniteElementRelatedData &output_data, + const CellSimilarity::Similarity cell_similarity) const = 0; virtual void - fill_fe_face_values (const Mapping &mapping, - const typename Triangulation::cell_iterator &cell, - const unsigned int face_no, - const Quadrature &quadrature, - const typename Mapping::InternalDataBase &mapping_internal, - const typename Mapping::InternalDataBase &fe_internal, - const internal::FEValues::MappingRelatedData &mapping_data, - internal::FEValues::FiniteElementRelatedData &output_data) const = 0; + fill_fe_face_values (const Mapping &mapping, + const typename Triangulation::cell_iterator &cell, + const unsigned int face_no, + const Quadrature &quadrature, + const typename Mapping::InternalDataBase &mapping_internal, + const typename Mapping::InternalDataBase &fe_internal, + const dealii::internal::FEValues::MappingRelatedData &mapping_data, + dealii::internal::FEValues::FiniteElementRelatedData &output_data) const = 0; virtual void - fill_fe_subface_values (const Mapping &mapping, - const typename Triangulation::cell_iterator &cell, - const unsigned int face_no, - const unsigned int sub_no, - const Quadrature &quadrature, - const typename Mapping::InternalDataBase &mapping_internal, - const typename Mapping::InternalDataBase &fe_internal, - const internal::FEValues::MappingRelatedData &mapping_data, - internal::FEValues::FiniteElementRelatedData &output_data) const = 0; + fill_fe_subface_values (const Mapping &mapping, + const typename Triangulation::cell_iterator &cell, + const unsigned int face_no, + const unsigned int sub_no, + const Quadrature &quadrature, + const typename Mapping::InternalDataBase &mapping_internal, + const typename Mapping::InternalDataBase &fe_internal, + const dealii::internal::FEValues::MappingRelatedData &mapping_data, + dealii::internal::FEValues::FiniteElementRelatedData &output_data) const = 0; friend class InternalDataBase; friend class FEValuesBase; diff --git a/include/deal.II/fe/fe_values.h b/include/deal.II/fe/fe_values.h index 47ccc77642..222a610326 100644 --- a/include/deal.II/fe/fe_values.h +++ b/include/deal.II/fe/fe_values.h @@ -1352,8 +1352,8 @@ namespace internal * @author Wolfgang Bangerth, 1998, 2003, Guido Kanschat, 2001 */ template -class FEValuesBase : protected internal::FEValues::MappingRelatedData, - protected internal::FEValues::FiniteElementRelatedData, +class FEValuesBase : protected dealii::internal::FEValues::MappingRelatedData, + protected dealii::internal::FEValues::FiniteElementRelatedData, public Subscriptor { public: diff --git a/include/deal.II/fe/mapping.h b/include/deal.II/fe/mapping.h index a2fcbcdff3..db5d63dc0e 100644 --- a/include/deal.II/fe/mapping.h +++ b/include/deal.II/fe/mapping.h @@ -787,11 +787,11 @@ private: */ virtual CellSimilarity::Similarity - fill_fe_values (const typename Triangulation::cell_iterator &cell, - const CellSimilarity::Similarity cell_similarity, - const Quadrature &quadrature, - const InternalDataBase &internal_data, - internal::FEValues::MappingRelatedData &output_data) const = 0; + fill_fe_values (const typename Triangulation::cell_iterator &cell, + const CellSimilarity::Similarity cell_similarity, + const Quadrature &quadrature, + const InternalDataBase &internal_data, + dealii::internal::FEValues::MappingRelatedData &output_data) const = 0; /** * This function is the equivalent to Mapping::fill_fe_values(), @@ -820,11 +820,11 @@ private: * @p internal_data object. */ virtual void - fill_fe_face_values (const typename Triangulation::cell_iterator &cell, - const unsigned int face_no, - const Quadrature &quadrature, - const InternalDataBase &internal_data, - internal::FEValues::MappingRelatedData &output_data) const = 0; + fill_fe_face_values (const typename Triangulation::cell_iterator &cell, + const unsigned int face_no, + const Quadrature &quadrature, + const InternalDataBase &internal_data, + dealii::internal::FEValues::MappingRelatedData &output_data) const = 0; /** * This function is the equivalent to Mapping::fill_fe_values(), @@ -856,12 +856,12 @@ private: * @p internal_data object. */ virtual void - fill_fe_subface_values (const typename Triangulation::cell_iterator &cell, - const unsigned int face_no, - const unsigned int subface_no, - const Quadrature &quadrature, - const InternalDataBase &internal_data, - internal::FEValues::MappingRelatedData &output_data) const = 0; + fill_fe_subface_values (const typename Triangulation::cell_iterator &cell, + const unsigned int face_no, + const unsigned int subface_no, + const Quadrature &quadrature, + const InternalDataBase &internal_data, + dealii::internal::FEValues::MappingRelatedData &output_data) const = 0; /** * Give class @p FEValues access to the private get_...data and diff --git a/include/deal.II/fe/mapping_q1.h b/include/deal.II/fe/mapping_q1.h index efd0ea8731..b3cd90fd66 100644 --- a/include/deal.II/fe/mapping_q1.h +++ b/include/deal.II/fe/mapping_q1.h @@ -324,11 +324,11 @@ public: */ virtual CellSimilarity::Similarity - fill_fe_values (const typename Triangulation::cell_iterator &cell, - const CellSimilarity::Similarity cell_similarity, - const Quadrature &quadrature, - const typename Mapping::InternalDataBase &internal_data, - internal::FEValues::MappingRelatedData &output_data) const; + fill_fe_values (const typename Triangulation::cell_iterator &cell, + const CellSimilarity::Similarity cell_similarity, + const Quadrature &quadrature, + const typename Mapping::InternalDataBase &internal_data, + dealii::internal::FEValues::MappingRelatedData &output_data) const; /** * Compute mapping-related information for a face of a cell. @@ -336,11 +336,11 @@ public: * a discussion of purpose and arguments of this function. */ virtual void - fill_fe_face_values (const typename Triangulation::cell_iterator &cell, - const unsigned int face_no, - const Quadrature &quadrature, - const typename Mapping::InternalDataBase &internal_data, - internal::FEValues::MappingRelatedData &output_data) const; + fill_fe_face_values (const typename Triangulation::cell_iterator &cell, + const unsigned int face_no, + const Quadrature &quadrature, + const typename Mapping::InternalDataBase &internal_data, + dealii::internal::FEValues::MappingRelatedData &output_data) const; /** * Compute mapping-related information for a child of a face of a cell. @@ -348,12 +348,12 @@ public: * a discussion of purpose and arguments of this function. */ virtual void - fill_fe_subface_values (const typename Triangulation::cell_iterator &cell, - const unsigned int face_no, - const unsigned int subface_no, - const Quadrature &quadrature, - const typename Mapping::InternalDataBase &internal_data, - internal::FEValues::MappingRelatedData &output_data) const; + fill_fe_subface_values (const typename Triangulation::cell_iterator &cell, + const unsigned int face_no, + const unsigned int subface_no, + const Quadrature &quadrature, + const typename Mapping::InternalDataBase &internal_data, + dealii::internal::FEValues::MappingRelatedData &output_data) const; /** * Compute shape values and/or derivatives. -- 2.39.5