From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Fri, 4 May 2018 02:05:13 +0000 (-0600)
Subject: Consistently mark all virtual functions of FE_Nothing as 'override'.
X-Git-Tag: v9.0.0-rc1~17^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F6444%2Fhead;p=dealii.git

Consistently mark all virtual functions of FE_Nothing as 'override'.

Apparently there are compilers that warn if one function is so marked, but not all. Thus,
be consistent.
---

diff --git a/include/deal.II/fe/fe_nothing.h b/include/deal.II/fe/fe_nothing.h
index c58aa5793a..1c1adcf493 100644
--- a/include/deal.II/fe/fe_nothing.h
+++ b/include/deal.II/fe/fe_nothing.h
@@ -97,7 +97,7 @@ public:
 
   virtual
   std::unique_ptr<FiniteElement<dim,spacedim> >
-  clone() const;
+  clone() const override;
 
   /**
    * Return a string that uniquely identifies a finite element. In this case
@@ -105,12 +105,12 @@ public:
    */
   virtual
   std::string
-  get_name() const;
+  get_name() const override;
 
   // for documentation, see the FiniteElement base class
   virtual
   UpdateFlags
-  requires_update_flags (const UpdateFlags update_flags) const;
+  requires_update_flags (const UpdateFlags update_flags) const override;
 
   /**
    * Return the value of the @p ith shape function at the point @p p. @p p is
@@ -121,7 +121,7 @@ public:
    */
   virtual
   double
-  shape_value (const unsigned int i, const Point<dim> &p) const;
+  shape_value (const unsigned int i, const Point<dim> &p) const override;
 
   virtual
   void
@@ -132,7 +132,7 @@ public:
                   const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
                   const dealii::internal::FEValuesImplementation::MappingRelatedData<dim, spacedim> &mapping_data,
                   const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
-                  dealii::internal::FEValuesImplementation::FiniteElementRelatedData<dim, spacedim> &output_data) const;
+                  dealii::internal::FEValuesImplementation::FiniteElementRelatedData<dim, spacedim> &output_data) const override;
 
   virtual
   void
@@ -143,7 +143,7 @@ public:
                        const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
                        const dealii::internal::FEValuesImplementation::MappingRelatedData<dim, spacedim> &mapping_data,
                        const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
-                       dealii::internal::FEValuesImplementation::FiniteElementRelatedData<dim, spacedim> &output_data) const;
+                       dealii::internal::FEValuesImplementation::FiniteElementRelatedData<dim, spacedim> &output_data) const override;
 
   virtual
   void
@@ -155,7 +155,7 @@ public:
                           const typename Mapping<dim,spacedim>::InternalDataBase              &mapping_internal,
                           const dealii::internal::FEValuesImplementation::MappingRelatedData<dim, spacedim> &mapping_data,
                           const typename FiniteElement<dim,spacedim>::InternalDataBase        &fe_internal,
-                          dealii::internal::FEValuesImplementation::FiniteElementRelatedData<dim, spacedim> &output_data) const;
+                          dealii::internal::FEValuesImplementation::FiniteElementRelatedData<dim, spacedim> &output_data) const override;
 
   /**
    * Prepare internal data structures and fill in values independent of the
@@ -171,7 +171,7 @@ public:
   get_data (const UpdateFlags                                                    update_flags,
             const Mapping<dim,spacedim>                                         &mapping,
             const Quadrature<dim>                                               &quadrature,
-            dealii::internal::FEValuesImplementation::FiniteElementRelatedData<dim, spacedim> &output_data) const;
+            dealii::internal::FEValuesImplementation::FiniteElementRelatedData<dim, spacedim> &output_data) const override;
 
   /**
    * Return whether this element dominates the one given as argument when they
@@ -189,25 +189,25 @@ public:
    */
   virtual
   FiniteElementDomination::Domination
-  compare_for_face_domination (const FiniteElement<dim,spacedim> &fe_other) const;
+  compare_for_face_domination (const FiniteElement<dim,spacedim> &fe_other) const override;
 
 
 
   virtual
   std::vector<std::pair<unsigned int, unsigned int> >
-  hp_vertex_dof_identities (const FiniteElement<dim,spacedim> &fe_other) const;
+  hp_vertex_dof_identities (const FiniteElement<dim,spacedim> &fe_other) const override;
 
   virtual
   std::vector<std::pair<unsigned int, unsigned int> >
-  hp_line_dof_identities (const FiniteElement<dim,spacedim> &fe_other) const;
+  hp_line_dof_identities (const FiniteElement<dim,spacedim> &fe_other) const override;
 
   virtual
   std::vector<std::pair<unsigned int, unsigned int> >
-  hp_quad_dof_identities (const FiniteElement<dim,spacedim> &fe_other) const;
+  hp_quad_dof_identities (const FiniteElement<dim,spacedim> &fe_other) const override;
 
   virtual
   bool
-  hp_constraints_are_implemented () const;
+  hp_constraints_are_implemented () const override;
 
   /**
    * Return the matrix interpolating from the given finite element to the
@@ -217,7 +217,7 @@ public:
   virtual
   void
   get_interpolation_matrix (const FiniteElement<dim,spacedim> &source_fe,
-                            FullMatrix<double>       &interpolation_matrix) const;
+                            FullMatrix<double>       &interpolation_matrix) const override;
 
   /**
    * Return the matrix interpolating from a face of one element to the face
@@ -231,7 +231,7 @@ public:
   virtual
   void
   get_face_interpolation_matrix (const FiniteElement<dim,spacedim> &source_fe,
-                                 FullMatrix<double>       &interpolation_matrix) const;
+                                 FullMatrix<double>       &interpolation_matrix) const override;
 
 
   /**
@@ -247,7 +247,7 @@ public:
   void
   get_subface_interpolation_matrix (const FiniteElement<dim,spacedim> &source_fe,
                                     const unsigned int index,
-                                    FullMatrix<double>  &interpolation_matrix) const;
+                                    FullMatrix<double>  &interpolation_matrix) const override;
 
   /**
    * @return true if the FE dominates any other.