From: Wolfgang Bangerth Date: Thu, 13 Aug 2015 20:02:38 +0000 (-0500) Subject: Make compile. Fix a few warnings. X-Git-Tag: v8.4.0-rc2~615^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1355%2Fhead;p=dealii.git Make compile. Fix a few warnings. #1343 did not compile for me, which is easily fixed by #including another header file. Also fix a whole bunch of warnings that were introduced by #1343. Finally, mark a comment in a way so that it doesn't get picked up by doxygen. --- diff --git a/include/deal.II/fe/fe_face.h b/include/deal.II/fe/fe_face.h index 5f2f55f709..baeb46664b 100644 --- a/include/deal.II/fe/fe_face.h +++ b/include/deal.II/fe/fe_face.h @@ -227,22 +227,24 @@ public: get_constant_modes () const; protected: - /** - NOTE: The following functions have their definitions inlined into the class declaration - * because we otherwise run into a compiler error with MS Visual Studio. - */ + /* + * NOTE: The following functions have their definitions inlined into the class declaration + * because we otherwise run into a compiler error with MS Visual Studio. + */ + + virtual typename FiniteElement<1,spacedim>::InternalDataBase * get_data (const UpdateFlags, - const Mapping<1,spacedim> &mapping, - const Quadrature<1> &quadrature) const + const Mapping<1,spacedim> &/*mapping*/, + const Quadrature<1> &/*quadrature*/) const { return new typename FiniteElement<1, spacedim>::InternalDataBase; } typename FiniteElement<1,spacedim>::InternalDataBase * get_face_data(const UpdateFlags update_flags, - const Mapping<1,spacedim> &mapping, + const Mapping<1,spacedim> &/*mapping*/, const Quadrature<0> &quadrature) const { // generate a new data object and initialize some fields diff --git a/include/deal.II/fe/fe_poly_face.h b/include/deal.II/fe/fe_poly_face.h index 3f7865eb03..c54b97f009 100644 --- a/include/deal.II/fe/fe_poly_face.h +++ b/include/deal.II/fe/fe_poly_face.h @@ -17,8 +17,10 @@ #define dealii__fe_poly_face_h +#include #include + DEAL_II_NAMESPACE_OPEN /*!@addtogroup febase */ @@ -73,15 +75,17 @@ public: unsigned int get_degree () const; protected: - /** - NOTE: The following functions have their definitions inlined into the class declaration - * because we otherwise run into a compiler error with MS Visual Studio. - */ + /* + * NOTE: The following functions have their definitions inlined into the class declaration + * because we otherwise run into a compiler error with MS Visual Studio. + */ + + virtual typename FiniteElement::InternalDataBase * - get_data (const UpdateFlags, - const Mapping &mapping, - const Quadrature &quadrature) const + get_data (const UpdateFlags /*update_flags*/, + const Mapping &/*mapping*/, + const Quadrature &/*quadrature*/) const { InternalData *data = new InternalData; return data; @@ -89,7 +93,7 @@ protected: typename FiniteElement::InternalDataBase * get_face_data(const UpdateFlags update_flags, - const Mapping &mapping, + const Mapping &/*mapping*/, const Quadrature& quadrature) const { // generate a new data object and