From: Wolfgang Bangerth Date: Tue, 18 Aug 2015 15:35:05 +0000 (-0500) Subject: Fully qualify types in Mapping interface. X-Git-Tag: v8.4.0-rc2~581^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b5f44cd53e01105ee021265d6e06eb0b97a0b72;p=dealii.git Fully qualify types in Mapping interface. Rather than just referring to the type as 'InternalDataBase', use 'typename Mapping::InternalDataBase'. The purpose is so that we use the same signature in the base and derived classes, since otherwise doxygen gets confused, doesn't recognize the functions in the derived classes as implementing the interface of the base class, and doesn't copy the documentation :-( --- diff --git a/include/deal.II/fe/mapping.h b/include/deal.II/fe/mapping.h index c93002f4c6..4611076daf 100644 --- a/include/deal.II/fe/mapping.h +++ b/include/deal.II/fe/mapping.h @@ -758,7 +758,7 @@ protected: fill_fe_values (const typename Triangulation::cell_iterator &cell, const CellSimilarity::Similarity cell_similarity, const Quadrature &quadrature, - const InternalDataBase &internal_data, + const typename Mapping::InternalDataBase &internal_data, dealii::internal::FEValues::MappingRelatedData &output_data) const = 0; /** @@ -791,7 +791,7 @@ protected: fill_fe_face_values (const typename Triangulation::cell_iterator &cell, const unsigned int face_no, const Quadrature &quadrature, - const InternalDataBase &internal_data, + const typename Mapping::InternalDataBase &internal_data, dealii::internal::FEValues::MappingRelatedData &output_data) const = 0; /** @@ -828,7 +828,7 @@ protected: const unsigned int face_no, const unsigned int subface_no, const Quadrature &quadrature, - const InternalDataBase &internal_data, + const typename Mapping::InternalDataBase &internal_data, dealii::internal::FEValues::MappingRelatedData &output_data) const = 0; /** @@ -893,7 +893,7 @@ public: void transform (const VectorSlice > > input, VectorSlice > > output, - const InternalDataBase &internal, + const typename Mapping::InternalDataBase &internal, const MappingType type) const = 0; @@ -931,7 +931,7 @@ public: void transform (const VectorSlice > > input, VectorSlice > > output, - const InternalDataBase &internal, + const typename Mapping::InternalDataBase &internal, const MappingType type) const = 0; @@ -975,7 +975,7 @@ public: void transform (const VectorSlice > > input, VectorSlice > > output, - const InternalDataBase &internal, + const typename Mapping::InternalDataBase &internal, const MappingType type) const = 0; /** @@ -1005,7 +1005,7 @@ public: void transform (const VectorSlice > > input, VectorSlice > > output, - const InternalDataBase &internal, + const typename Mapping::InternalDataBase &internal, const MappingType type) const = 0; /** @@ -1045,7 +1045,7 @@ public: void transform (const VectorSlice > > input, VectorSlice > > output, - const InternalDataBase &internal, + const typename Mapping::InternalDataBase &internal, const MappingType type) const = 0; /**