Mark two more of the FiniteElement::fill_fe_values arguments as const.

These two arguments were supposed to be input arguments, but weren't marked as const. Do
this here, and document the respective functions better.

diff --git a/include/deal.II/fe/fe.h b/include/deal.II/fe/fe.h
index 8475130c63c14c8397b8af67d19a050964599935..2bd6306476d653424706fae7eff5b050abf8963a 100644 (file)
--- a/include/deal.II/fe/fe.h
+++ b/include/deal.II/fe/fe.h
@@ -1972,8 +1972,8 @@ protected:
   void compute_2nd (const Mapping<dim,spacedim>                      &mapping,
                     const typename Triangulation<dim,spacedim>::cell_iterator    &cell,
                     const unsigned int                       offset,
-                    typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
-                    InternalDataBase                        &fe_internal,
+                    const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+                    const InternalDataBase                        &fe_internal,
                     FEValuesData<dim,spacedim>                       &data) const;
 
   /**
@@ -2061,8 +2061,8 @@ protected:
   fill_fe_values (const Mapping<dim,spacedim>                               &mapping,
                   const typename Triangulation<dim,spacedim>::cell_iterator &cell,
                   const Quadrature<dim>                                     &quadrature,
-                  typename Mapping<dim,spacedim>::InternalDataBase          &mapping_internal,
-                  typename Mapping<dim,spacedim>::InternalDataBase          &fe_internal,
+                  const typename Mapping<dim,spacedim>::InternalDataBase          &mapping_internal,
+                  const typename Mapping<dim,spacedim>::InternalDataBase          &fe_internal,
                   FEValuesData<dim,spacedim>                                &data,
                   CellSimilarity::Similarity                           &cell_similarity) const = 0;
 
@@ -2078,8 +2078,8 @@ protected:
                        const typename Triangulation<dim,spacedim>::cell_iterator &cell,
                        const unsigned int                    face_no,
                        const Quadrature<dim-1>              &quadrature,
-                       typename Mapping<dim,spacedim>::InternalDataBase       &mapping_internal,
-                       typename Mapping<dim,spacedim>::InternalDataBase       &fe_internal,
+                       const typename Mapping<dim,spacedim>::InternalDataBase       &mapping_internal,
+                       const typename Mapping<dim,spacedim>::InternalDataBase       &fe_internal,
                        FEValuesData<dim,spacedim>                    &data) const = 0;
 
   /**
@@ -2095,8 +2095,8 @@ protected:
                           const unsigned int                    face_no,
                           const unsigned int                    sub_no,
                           const Quadrature<dim-1>              &quadrature,
-                          typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
-                          typename Mapping<dim,spacedim>::InternalDataBase &fe_internal,
+                          const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+                          const typename Mapping<dim,spacedim>::InternalDataBase &fe_internal,
                           FEValuesData<dim,spacedim>                    &data) const = 0;
 
   friend class InternalDataBase;

diff --git a/include/deal.II/fe/fe_dgp_nonparametric.h b/include/deal.II/fe/fe_dgp_nonparametric.h
index 2e4b3ffdaf5c4967d4583b1a20041291f5feee4f..a9caaf9baa59306e484501028c2309ce5647581e 100644 (file)
--- a/include/deal.II/fe/fe_dgp_nonparametric.h
+++ b/include/deal.II/fe/fe_dgp_nonparametric.h
@@ -536,8 +536,8 @@ protected:
   fill_fe_values (const Mapping<dim,spacedim> &mapping,
                   const typename Triangulation<dim,spacedim>::cell_iterator &cell,
                   const Quadrature<dim>                                 &quadrature,
-                  typename Mapping<dim,spacedim>::InternalDataBase      &mapping_internal,
-                  typename Mapping<dim,spacedim>::InternalDataBase      &fe_internal,
+                  const typename Mapping<dim,spacedim>::InternalDataBase      &mapping_internal,
+                  const typename Mapping<dim,spacedim>::InternalDataBase      &fe_internal,
                   FEValuesData<dim,spacedim>                            &data,
                   CellSimilarity::Similarity                       &cell_similarity) const;
 
@@ -549,8 +549,8 @@ protected:
                        const typename Triangulation<dim,spacedim>::cell_iterator &cell,
                        const unsigned int                    face_no,
                        const Quadrature<dim-1>                &quadrature,
-                       typename Mapping<dim,spacedim>::InternalDataBase      &mapping_internal,
-                       typename Mapping<dim,spacedim>::InternalDataBase      &fe_internal,
+                       const typename Mapping<dim,spacedim>::InternalDataBase      &mapping_internal,
+                       const typename Mapping<dim,spacedim>::InternalDataBase      &fe_internal,
                        FEValuesData<dim,spacedim> &data) const ;
 
   /**
@@ -562,8 +562,8 @@ protected:
                           const unsigned int                    face_no,
                           const unsigned int                    sub_no,
                           const Quadrature<dim-1>                &quadrature,
-                          typename Mapping<dim,spacedim>::InternalDataBase      &mapping_internal,
-                          typename Mapping<dim,spacedim>::InternalDataBase      &fe_internal,
+                          const typename Mapping<dim,spacedim>::InternalDataBase      &mapping_internal,
+                          const typename Mapping<dim,spacedim>::InternalDataBase      &fe_internal,
                           FEValuesData<dim,spacedim> &data) const ;
 
 private:

diff --git a/include/deal.II/fe/fe_face.h b/include/deal.II/fe/fe_face.h
index 42498990fb5ee6495dfd7f78e5ce169effebc053..5393a420971b06da02c8a7e4c05b2476ee41e98f 100644 (file)
--- a/include/deal.II/fe/fe_face.h
+++ b/include/deal.II/fe/fe_face.h
@@ -247,8 +247,8 @@ protected:
   fill_fe_values (const Mapping<1,spacedim>                           &mapping,
                   const typename Triangulation<1,spacedim>::cell_iterator &cell,
                   const Quadrature<1>                                 &quadrature,
-                  typename Mapping<1,spacedim>::InternalDataBase      &mapping_internal,
-                  typename Mapping<1,spacedim>::InternalDataBase      &fe_internal,
+                  const typename Mapping<1,spacedim>::InternalDataBase      &mapping_internal,
+                  const typename Mapping<1,spacedim>::InternalDataBase      &fe_internal,
                   FEValuesData<1,spacedim>                            &data,
                   CellSimilarity::Similarity                       &cell_similarity) const;
 
@@ -257,8 +257,8 @@ protected:
                        const typename Triangulation<1,spacedim>::cell_iterator &cell,
                        const unsigned int                    face_no,
                        const Quadrature<0>                &quadrature,
-                       typename Mapping<1,spacedim>::InternalDataBase      &mapping_internal,
-                       typename Mapping<1,spacedim>::InternalDataBase      &fe_internal,
+                       const typename Mapping<1,spacedim>::InternalDataBase      &mapping_internal,
+                       const typename Mapping<1,spacedim>::InternalDataBase      &fe_internal,
                        FEValuesData<1,spacedim> &data) const ;
 
   virtual void
@@ -267,8 +267,8 @@ protected:
                           const unsigned int                    face_no,
                           const unsigned int                    sub_no,
                           const Quadrature<0>                &quadrature,
-                          typename Mapping<1,spacedim>::InternalDataBase      &mapping_internal,
-                          typename Mapping<1,spacedim>::InternalDataBase      &fe_internal,
+                          const typename Mapping<1,spacedim>::InternalDataBase      &mapping_internal,
+                          const typename Mapping<1,spacedim>::InternalDataBase      &fe_internal,
                           FEValuesData<1,spacedim> &data) const ;
 
 

diff --git a/include/deal.II/fe/fe_nothing.h b/include/deal.II/fe/fe_nothing.h
index ae556d61d5099b2e9e029ca899237d049a2eeb30..9081f5f22de7245e48f857a27c299c774ec11512 100644 (file)
--- a/include/deal.II/fe/fe_nothing.h
+++ b/include/deal.II/fe/fe_nothing.h
@@ -159,8 +159,8 @@ public:
   fill_fe_values (const Mapping<dim,spacedim> &mapping,
                   const typename Triangulation<dim,spacedim>::cell_iterator &cell,
                   const Quadrature<dim> &quadrature,
-                  typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
-                  typename Mapping<dim,spacedim>::InternalDataBase &fedata,
+                  const typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
+                  const typename Mapping<dim,spacedim>::InternalDataBase &fedata,
                   FEValuesData<dim,spacedim> &data,
                   CellSimilarity::Similarity &cell_similarity) const;
 
@@ -177,8 +177,8 @@ public:
                        const typename Triangulation<dim,spacedim>::cell_iterator &cell,
                        const unsigned int face,
                        const Quadrature<dim-1> & quadrature,
-                       typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
-                       typename Mapping<dim,spacedim>::InternalDataBase &fedata,
+                       const typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
+                       const typename Mapping<dim,spacedim>::InternalDataBase &fedata,
                        FEValuesData<dim,spacedim> &data) const;
 
   /**
@@ -195,8 +195,8 @@ public:
                           const unsigned int face,
                           const unsigned int subface,
                           const Quadrature<dim-1> & quadrature,
-                          typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
-                          typename Mapping<dim,spacedim>::InternalDataBase &fedata,
+                          const typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
+                          const typename Mapping<dim,spacedim>::InternalDataBase &fedata,
                           FEValuesData<dim,spacedim> &data) const;
 
   /**

diff --git a/include/deal.II/fe/fe_poly.h b/include/deal.II/fe/fe_poly.h
index 4ba1f278304b904aa594dc0fe949365c6bfdc224..50cd7139810e0da260a4da1022b4aeb269648286 100644 (file)
--- a/include/deal.II/fe/fe_poly.h
+++ b/include/deal.II/fe/fe_poly.h
@@ -172,8 +172,8 @@ protected:
   fill_fe_values (const Mapping<dim,spacedim>                           &mapping,
                   const typename Triangulation<dim,spacedim>::cell_iterator &cell,
                   const Quadrature<dim>                                 &quadrature,
-                  typename Mapping<dim,spacedim>::InternalDataBase      &mapping_internal,
-                  typename Mapping<dim,spacedim>::InternalDataBase      &fe_internal,
+                  const typename Mapping<dim,spacedim>::InternalDataBase      &mapping_internal,
+                  const typename Mapping<dim,spacedim>::InternalDataBase      &fe_internal,
                   FEValuesData<dim,spacedim>                            &data,
                   CellSimilarity::Similarity                       &cell_similarity) const;
 
@@ -182,8 +182,8 @@ protected:
                        const typename Triangulation<dim,spacedim>::cell_iterator &cell,
                        const unsigned int                    face_no,
                        const Quadrature<dim-1>                &quadrature,
-                       typename Mapping<dim,spacedim>::InternalDataBase      &mapping_internal,
-                       typename Mapping<dim,spacedim>::InternalDataBase      &fe_internal,
+                       const typename Mapping<dim,spacedim>::InternalDataBase      &mapping_internal,
+                       const typename Mapping<dim,spacedim>::InternalDataBase      &fe_internal,
                        FEValuesData<dim,spacedim> &data) const ;
 
   virtual void
@@ -192,8 +192,8 @@ protected:
                           const unsigned int                    face_no,
                           const unsigned int                    sub_no,
                           const Quadrature<dim-1>                &quadrature,
-                          typename Mapping<dim,spacedim>::InternalDataBase      &mapping_internal,
-                          typename Mapping<dim,spacedim>::InternalDataBase      &fe_internal,
+                          const typename Mapping<dim,spacedim>::InternalDataBase      &mapping_internal,
+                          const typename Mapping<dim,spacedim>::InternalDataBase      &fe_internal,
                           FEValuesData<dim,spacedim> &data) const ;
 
 

diff --git a/include/deal.II/fe/fe_poly.templates.h b/include/deal.II/fe/fe_poly.templates.h
index ca03688c768977dd30d19c30a21f66c94eff4046..1a1e0390bf0b49447370f7dbb789ab41d2c747c4 100644 (file)
--- a/include/deal.II/fe/fe_poly.templates.h
+++ b/include/deal.II/fe/fe_poly.templates.h
@@ -251,8 +251,8 @@ FE_Poly<POLY,dim,spacedim>::fill_fe_values
 (const Mapping<dim,spacedim>                      &mapping,
  const typename Triangulation<dim,spacedim>::cell_iterator &cell,
  const Quadrature<dim>                            &quadrature,
- typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
- typename Mapping<dim,spacedim>::InternalDataBase &fedata,
+ const typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
+ const typename Mapping<dim,spacedim>::InternalDataBase &fedata,
  FEValuesData<dim,spacedim>                       &data,
  CellSimilarity::Similarity                  &cell_similarity) const
 {
@@ -260,8 +260,8 @@ FE_Poly<POLY,dim,spacedim>::fill_fe_values
   // data for this class. fails with
   // an exception if that is not
   // possible
-  Assert (dynamic_cast<InternalData *> (&fedata) != 0, ExcInternalError());
-  InternalData &fe_data = static_cast<InternalData &> (fedata);
+  Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
+  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
 
   const UpdateFlags flags(fe_data.current_update_flags());
 
@@ -290,16 +290,16 @@ fill_fe_face_values (const Mapping<dim,spacedim>                   &mapping,
                      const typename Triangulation<dim,spacedim>::cell_iterator &cell,
                      const unsigned int                    face,
                      const Quadrature<dim-1>              &quadrature,
-                     typename Mapping<dim,spacedim>::InternalDataBase       &mapping_data,
-                     typename Mapping<dim,spacedim>::InternalDataBase       &fedata,
+                     const typename Mapping<dim,spacedim>::InternalDataBase       &mapping_data,
+                     const typename Mapping<dim,spacedim>::InternalDataBase       &fedata,
                      FEValuesData<dim,spacedim>                    &data) const
 {
   // convert data object to internal
   // data for this class. fails with
   // an exception if that is not
   // possible
-  Assert (dynamic_cast<InternalData *> (&fedata) != 0, ExcInternalError());
-  InternalData &fe_data = static_cast<InternalData &> (fedata);
+  Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
+  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
 
   // offset determines which data set
   // to take (all data sets for all
@@ -405,16 +405,16 @@ FE_Poly<POLY,dim,spacedim>::fill_fe_subface_values (const Mapping<dim,spacedim>
                                                     const unsigned int                    face,
                                                     const unsigned int                    subface,
                                                     const Quadrature<dim-1>              &quadrature,
-                                                    typename Mapping<dim,spacedim>::InternalDataBase       &mapping_data,
-                                                    typename Mapping<dim,spacedim>::InternalDataBase       &fedata,
+                                                    const typename Mapping<dim,spacedim>::InternalDataBase       &mapping_data,
+                                                    const typename Mapping<dim,spacedim>::InternalDataBase       &fedata,
                                                     FEValuesData<dim,spacedim>                    &data) const
 {
   // convert data object to internal
   // data for this class. fails with
   // an exception if that is not
   // possible
-  Assert (dynamic_cast<InternalData *> (&fedata) != 0, ExcInternalError());
-  InternalData &fe_data = static_cast<InternalData &> (fedata);
+  Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
+  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
 
   // offset determines which data set
   // to take (all data sets for all

diff --git a/include/deal.II/fe/fe_poly_face.h b/include/deal.II/fe/fe_poly_face.h
index e328155a235a750881cea0ed4e083d450ddaf76b..c1195d795b19169b7272abe3173c96cae860ca2e 100644 (file)
--- a/include/deal.II/fe/fe_poly_face.h
+++ b/include/deal.II/fe/fe_poly_face.h
@@ -160,8 +160,8 @@ protected:
   fill_fe_values (const Mapping<dim,spacedim>                           &mapping,
                   const typename Triangulation<dim,spacedim>::cell_iterator &cell,
                   const Quadrature<dim>                                 &quadrature,
-                  typename Mapping<dim,spacedim>::InternalDataBase      &mapping_internal,
-                  typename Mapping<dim,spacedim>::InternalDataBase      &fe_internal,
+                  const typename Mapping<dim,spacedim>::InternalDataBase      &mapping_internal,
+                  const typename Mapping<dim,spacedim>::InternalDataBase      &fe_internal,
                   FEValuesData<dim,spacedim>                            &data,
                   CellSimilarity::Similarity                       &cell_similarity) const;
 
@@ -170,8 +170,8 @@ protected:
                        const typename Triangulation<dim,spacedim>::cell_iterator &cell,
                        const unsigned int                    face_no,
                        const Quadrature<dim-1>                &quadrature,
-                       typename Mapping<dim,spacedim>::InternalDataBase      &mapping_internal,
-                       typename Mapping<dim,spacedim>::InternalDataBase      &fe_internal,
+                       const typename Mapping<dim,spacedim>::InternalDataBase      &mapping_internal,
+                       const typename Mapping<dim,spacedim>::InternalDataBase      &fe_internal,
                        FEValuesData<dim,spacedim> &data) const ;
 
   virtual void
@@ -180,8 +180,8 @@ protected:
                           const unsigned int                    face_no,
                           const unsigned int                    sub_no,
                           const Quadrature<dim-1>                &quadrature,
-                          typename Mapping<dim,spacedim>::InternalDataBase      &mapping_internal,
-                          typename Mapping<dim,spacedim>::InternalDataBase      &fe_internal,
+                          const typename Mapping<dim,spacedim>::InternalDataBase      &mapping_internal,
+                          const typename Mapping<dim,spacedim>::InternalDataBase      &fe_internal,
                           FEValuesData<dim,spacedim> &data) const ;
 
 

diff --git a/include/deal.II/fe/fe_poly_face.templates.h b/include/deal.II/fe/fe_poly_face.templates.h
index 9249620cb18c818d27798d9ca76cbcad4c29c6ff..1af8143aab8da455dce510558e8ca3b06d88b2a1 100644 (file)
--- a/include/deal.II/fe/fe_poly_face.templates.h
+++ b/include/deal.II/fe/fe_poly_face.templates.h
@@ -175,8 +175,8 @@ FE_PolyFace<POLY,dim,spacedim>::fill_fe_values
 (const Mapping<dim,spacedim> &,
  const typename Triangulation<dim,spacedim>::cell_iterator &,
  const Quadrature<dim> &,
- typename Mapping<dim,spacedim>::InternalDataBase &,
- typename Mapping<dim,spacedim>::InternalDataBase &,
+ const typename Mapping<dim,spacedim>::InternalDataBase &,
+ const typename Mapping<dim,spacedim>::InternalDataBase &,
  FEValuesData<dim,spacedim> &,
  CellSimilarity::Similarity &) const
 {
@@ -193,16 +193,16 @@ FE_PolyFace<POLY,dim,spacedim>::fill_fe_face_values (
   const typename Triangulation<dim,spacedim>::cell_iterator &,
   const unsigned int face,
   const Quadrature<dim-1>& quadrature,
-  typename Mapping<dim,spacedim>::InternalDataBase &,
-  typename Mapping<dim,spacedim>::InternalDataBase &fedata,
+  const typename Mapping<dim,spacedim>::InternalDataBase &,
+  const typename Mapping<dim,spacedim>::InternalDataBase &fedata,
   FEValuesData<dim,spacedim> &data) const
 {
   // convert data object to internal
   // data for this class. fails with
   // an exception if that is not
   // possible
-  Assert (dynamic_cast<InternalData *> (&fedata) != 0, ExcInternalError());
-  InternalData &fe_data = static_cast<InternalData &> (fedata);
+  Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
+  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
 
   const UpdateFlags flags(fe_data.update_once | fe_data.update_each);
 
@@ -257,16 +257,16 @@ FE_PolyFace<POLY,dim,spacedim>::fill_fe_subface_values (
   const unsigned int face,
   const unsigned int subface,
   const Quadrature<dim-1>& quadrature,
-  typename Mapping<dim,spacedim>::InternalDataBase &,
-  typename Mapping<dim,spacedim>::InternalDataBase &fedata,
+  const typename Mapping<dim,spacedim>::InternalDataBase &,
+  const typename Mapping<dim,spacedim>::InternalDataBase &fedata,
   FEValuesData<dim,spacedim> &data) const
 {
   // convert data object to internal
   // data for this class. fails with
   // an exception if that is not
   // possible
-  Assert (dynamic_cast<InternalData *> (&fedata) != 0, ExcInternalError());
-  InternalData &fe_data = static_cast<InternalData &> (fedata);
+  Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
+  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
 
   const UpdateFlags flags(fe_data.update_once | fe_data.update_each);
 

diff --git a/include/deal.II/fe/fe_poly_tensor.h b/include/deal.II/fe/fe_poly_tensor.h
index 9bdedbf39343d1d44d840ea93e1c36822f0ad6b5..7444d8ea7db890dc92b65cb095f63efdf8c63eba 100644 (file)
--- a/include/deal.II/fe/fe_poly_tensor.h
+++ b/include/deal.II/fe/fe_poly_tensor.h
@@ -185,8 +185,8 @@ protected:
   fill_fe_values (const Mapping<dim,spacedim>                       &mapping,
                   const typename Triangulation<dim,spacedim>::cell_iterator &cell,
                   const Quadrature<dim>                             &quadrature,
-                  typename Mapping<dim,spacedim>::InternalDataBase  &mapping_internal,
-                  typename Mapping<dim,spacedim>::InternalDataBase  &fe_internal,
+                  const typename Mapping<dim,spacedim>::InternalDataBase  &mapping_internal,
+                  const typename Mapping<dim,spacedim>::InternalDataBase  &fe_internal,
                   FEValuesData<dim,spacedim>                        &data,
                   CellSimilarity::Similarity                   &cell_similarity) const;
 
@@ -195,8 +195,8 @@ protected:
                        const typename Triangulation<dim,spacedim>::cell_iterator &cell,
                        const unsigned int                                  face_no,
                        const Quadrature<dim-1>                            &quadrature,
-                       typename Mapping<dim,spacedim>::InternalDataBase   &mapping_internal,
-                       typename Mapping<dim,spacedim>::InternalDataBase   &fe_internal,
+                       const typename Mapping<dim,spacedim>::InternalDataBase   &mapping_internal,
+                       const typename Mapping<dim,spacedim>::InternalDataBase   &fe_internal,
                        FEValuesData<dim,spacedim> &data) const ;
 
   virtual void
@@ -205,8 +205,8 @@ protected:
                           const unsigned int                    face_no,
                           const unsigned int                    sub_no,
                           const Quadrature<dim-1>                &quadrature,
-                          typename Mapping<dim,spacedim>::InternalDataBase      &mapping_internal,
-                          typename Mapping<dim,spacedim>::InternalDataBase      &fe_internal,
+                          const typename Mapping<dim,spacedim>::InternalDataBase      &mapping_internal,
+                          const typename Mapping<dim,spacedim>::InternalDataBase      &fe_internal,
                           FEValuesData<dim,spacedim> &data) const ;
 
   /**

diff --git a/include/deal.II/fe/fe_system.h b/include/deal.II/fe/fe_system.h
index 1514b1e0ede6a33b87e73c0567d2413156d5ebf9..72f487273846ad046fb1846c1f1b266e45fb4604 100644 (file)
--- a/include/deal.II/fe/fe_system.h
+++ b/include/deal.II/fe/fe_system.h
@@ -822,8 +822,8 @@ protected:
   fill_fe_values (const Mapping<dim,spacedim>                      &mapping,
                   const typename Triangulation<dim,spacedim>::cell_iterator &cell,
                   const Quadrature<dim>                            &quadrature,
-                  typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
-                  typename Mapping<dim,spacedim>::InternalDataBase &fe_data,
+                  const typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
+                  const typename Mapping<dim,spacedim>::InternalDataBase &fe_data,
                   FEValuesData<dim,spacedim>                       &data,
                   CellSimilarity::Similarity                  &cell_similarity) const;
 
@@ -838,8 +838,8 @@ protected:
                        const typename Triangulation<dim,spacedim>::cell_iterator &cell,
                        const unsigned int                    face_no,
                        const Quadrature<dim-1>              &quadrature,
-                       typename Mapping<dim,spacedim>::InternalDataBase      &mapping_data,
-                       typename Mapping<dim,spacedim>::InternalDataBase      &fe_data,
+                       const typename Mapping<dim,spacedim>::InternalDataBase      &mapping_data,
+                       const typename Mapping<dim,spacedim>::InternalDataBase      &fe_data,
                        FEValuesData<dim,spacedim>                    &data) const;
 
   /**
@@ -854,8 +854,8 @@ protected:
                           const unsigned int                    face_no,
                           const unsigned int                    sub_no,
                           const Quadrature<dim-1>              &quadrature,
-                          typename Mapping<dim,spacedim>::InternalDataBase      &mapping_data,
-                          typename Mapping<dim,spacedim>::InternalDataBase      &fe_data,
+                          const typename Mapping<dim,spacedim>::InternalDataBase      &mapping_data,
+                          const typename Mapping<dim,spacedim>::InternalDataBase      &fe_data,
                           FEValuesData<dim,spacedim>                    &data) const;
 
 
@@ -875,9 +875,9 @@ protected:
                      const unsigned int                                face_no,
                      const unsigned int                                sub_no,
                      const Quadrature<dim_1>                          &quadrature,
-                     CellSimilarity::Similarity                   cell_similarity,
-                     typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
-                     typename Mapping<dim,spacedim>::InternalDataBase &fe_data,
+                     const CellSimilarity::Similarity                   cell_similarity,
+                     const typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
+                     const typename Mapping<dim,spacedim>::InternalDataBase &fe_data,
                      FEValuesData<dim,spacedim>                       &data) const;
 
 private:
@@ -1050,8 +1050,8 @@ private:
     const unsigned int                                sub_no,
     const Quadrature<dim_1>                          &quadrature,
     CellSimilarity::Similarity                   cell_similarity,
-    typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
-    typename Mapping<dim,spacedim>::InternalDataBase &fedata,
+    const typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
+    const typename Mapping<dim,spacedim>::InternalDataBase &fedata,
     const unsigned int                                base_element,
     FEValuesData<dim,spacedim>                       &data) const;
 

diff --git a/source/fe/fe.cc b/source/fe/fe.cc
index feb9f106e1c45ccd69248dda1a6efb1df6c63b24..9c5234a027092192208c3924225969df28bcc738 100644 (file)
--- a/source/fe/fe.cc
+++ b/source/fe/fe.cc
@@ -1218,11 +1218,10 @@ FiniteElement<1,2>::compute_2nd (
   const Mapping<1,2> &,
   const Triangulation<1,2>::cell_iterator &,
   const unsigned int,
-  Mapping<1,2>::InternalDataBase &,
-  InternalDataBase &,
+  const Mapping<1,2>::InternalDataBase &,
+  const InternalDataBase &,
   FEValuesData<1,2> &) const
 {
-
   Assert(false, ExcNotImplemented());
 }
 
@@ -1233,11 +1232,10 @@ FiniteElement<1,3>::compute_2nd (
   const Mapping<1,3> &,
   const Triangulation<1,3>::cell_iterator &,
   const unsigned int,
-  Mapping<1,3>::InternalDataBase &,
-  InternalDataBase &,
+  const Mapping<1,3>::InternalDataBase &,
+  const InternalDataBase &,
   FEValuesData<1,3> &) const
 {
-
   Assert(false, ExcNotImplemented());
 }
 
@@ -1249,11 +1247,10 @@ FiniteElement<2,3>::compute_2nd (
   const Mapping<2,3> &,
   const Triangulation<2,3>::cell_iterator &,
   const unsigned int,
-  Mapping<2,3>::InternalDataBase &,
-  InternalDataBase &,
+  const Mapping<2,3>::InternalDataBase &,
+  const InternalDataBase &,
   FEValuesData<2,3> &) const
 {
-
   Assert(false, ExcNotImplemented());
 }
 
@@ -1265,8 +1262,8 @@ FiniteElement<dim,spacedim>::compute_2nd (
   const Mapping<dim,spacedim>                   &mapping,
   const typename Triangulation<dim,spacedim>::cell_iterator &cell,
   const unsigned int offset,
-  typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
-  InternalDataBase                     &fe_internal,
+  const typename Mapping<dim,spacedim>::InternalDataBase &mapping_internal,
+  const InternalDataBase                     &fe_internal,
   FEValuesData<dim,spacedim>                    &data) const
 {
   Assert ((fe_internal.update_each | fe_internal.update_once)

diff --git a/source/fe/fe_dgp_nonparametric.cc b/source/fe/fe_dgp_nonparametric.cc
index 303e1ffc63fe7a4097970fc813246a10966d473d..76df29295457335cb27f9abc23b0e9b85e5d3ebf 100644 (file)
--- a/source/fe/fe_dgp_nonparametric.cc
+++ b/source/fe/fe_dgp_nonparametric.cc
@@ -281,8 +281,8 @@ FE_DGPNonparametric<dim,spacedim>::fill_fe_values (
   const Mapping<dim,spacedim> &,
   const typename Triangulation<dim,spacedim>::cell_iterator &,
   const Quadrature<dim> &,
-  typename Mapping<dim,spacedim>::InternalDataBase &,
-  typename Mapping<dim,spacedim>::InternalDataBase &fe_data,
+  const typename Mapping<dim,spacedim>::InternalDataBase &,
+  const typename Mapping<dim,spacedim>::InternalDataBase &fe_data,
   FEValuesData<dim,spacedim> &data,
   CellSimilarity::Similarity &/*cell_similarity*/) const
 {
@@ -321,8 +321,8 @@ FE_DGPNonparametric<dim,spacedim>::fill_fe_face_values (
   const typename Triangulation<dim,spacedim>::cell_iterator &,
   const unsigned int,
   const Quadrature<dim-1>&,
-  typename Mapping<dim,spacedim>::InternalDataBase &,
-  typename Mapping<dim,spacedim>::InternalDataBase       &fe_data,
+  const typename Mapping<dim,spacedim>::InternalDataBase &,
+  const typename Mapping<dim,spacedim>::InternalDataBase       &fe_data,
   FEValuesData<dim,spacedim>                             &data) const
 {
   const UpdateFlags flags(fe_data.update_once | fe_data.update_each);
@@ -361,8 +361,8 @@ FE_DGPNonparametric<dim,spacedim>::fill_fe_subface_values (
   const unsigned int,
   const unsigned int,
   const Quadrature<dim-1>&,
-  typename Mapping<dim,spacedim>::InternalDataBase &,
-  typename Mapping<dim,spacedim>::InternalDataBase       &fe_data,
+  const typename Mapping<dim,spacedim>::InternalDataBase &,
+  const typename Mapping<dim,spacedim>::InternalDataBase       &fe_data,
   FEValuesData<dim,spacedim>                             &data) const
 {
   const UpdateFlags flags(fe_data.update_once | fe_data.update_each);

diff --git a/source/fe/fe_face.cc b/source/fe/fe_face.cc
index 7b961e689d4a24c400e6100abf10c85007a5bf3a..a6cc2341721153a12db62c0a380a36fd1e2942e1 100644 (file)
--- a/source/fe/fe_face.cc
+++ b/source/fe/fe_face.cc
@@ -521,8 +521,8 @@ FE_FaceQ<1,spacedim>::fill_fe_values
 (const Mapping<1,spacedim> &,
  const typename Triangulation<1,spacedim>::cell_iterator &,
  const Quadrature<1> &,
- typename Mapping<1,spacedim>::InternalDataBase &,
- typename Mapping<1,spacedim>::InternalDataBase &,
+ const typename Mapping<1,spacedim>::InternalDataBase &,
+ const typename Mapping<1,spacedim>::InternalDataBase &,
  FEValuesData<1,spacedim> &,
  CellSimilarity::Similarity &) const
 {
@@ -538,8 +538,8 @@ FE_FaceQ<1,spacedim>::fill_fe_face_values (
   const typename Triangulation<1,spacedim>::cell_iterator &,
   const unsigned int face,
   const Quadrature<0> &,
-  typename Mapping<1,spacedim>::InternalDataBase &,
-  typename Mapping<1,spacedim>::InternalDataBase &fedata,
+  const typename Mapping<1,spacedim>::InternalDataBase &,
+  const typename Mapping<1,spacedim>::InternalDataBase &fedata,
   FEValuesData<1,spacedim> &data) const
 {
   const UpdateFlags flags(fedata.update_once | fedata.update_each);
@@ -562,11 +562,11 @@ FE_FaceQ<1,spacedim>::fill_fe_subface_values (
   const unsigned int ,
   const unsigned int ,
   const Quadrature<0> &,
-  typename Mapping<1,spacedim>::InternalDataBase &,
-  typename Mapping<1,spacedim>::InternalDataBase &,
+  const typename Mapping<1,spacedim>::InternalDataBase &,
+  const typename Mapping<1,spacedim>::InternalDataBase &,
   FEValuesData<1,spacedim> &) const
 {
-  Assert(false, ExcMessage("Should not fille subface values in 1D"));
+  Assert(false, ExcMessage("There are no sub-face values to fill in 1D!"));
 }
 
 

diff --git a/source/fe/fe_nothing.cc b/source/fe/fe_nothing.cc
index 259326b237a3a7f91962285a847265eb0c298e1a..3c2a37a27267ad02e1cf9d0096a4bc43d60b9739 100644 (file)
--- a/source/fe/fe_nothing.cc
+++ b/source/fe/fe_nothing.cc
@@ -120,8 +120,8 @@ FE_Nothing<dim,spacedim>::
 fill_fe_values (const Mapping<dim,spacedim> & /*mapping*/,
                 const typename Triangulation<dim,spacedim>::cell_iterator & /*cell*/,
                 const Quadrature<dim> & /*quadrature*/,
-                typename Mapping<dim,spacedim>::InternalDataBase & /*mapping_data*/,
-                typename Mapping<dim,spacedim>::InternalDataBase & /*fedata*/,
+                const typename Mapping<dim,spacedim>::InternalDataBase & /*mapping_data*/,
+                const typename Mapping<dim,spacedim>::InternalDataBase & /*fedata*/,
                 FEValuesData<dim,spacedim> & /*data*/,
                 CellSimilarity::Similarity & /*cell_similarity*/) const
 {
@@ -137,8 +137,8 @@ fill_fe_face_values (const Mapping<dim,spacedim> & /*mapping*/,
                      const typename Triangulation<dim,spacedim>::cell_iterator & /*cell*/,
                      const unsigned int /*face*/,
                      const Quadrature<dim-1> & /*quadrature*/,
-                     typename Mapping<dim,spacedim>::InternalDataBase & /*mapping_data*/,
-                     typename Mapping<dim,spacedim>::InternalDataBase & /*fedata*/,
+                     const typename Mapping<dim,spacedim>::InternalDataBase & /*mapping_data*/,
+                     const typename Mapping<dim,spacedim>::InternalDataBase & /*fedata*/,
                      FEValuesData<dim,spacedim> & /*data*/) const
 {
   // leave data fields empty
@@ -152,8 +152,8 @@ fill_fe_subface_values (const Mapping<dim,spacedim> & /*mapping*/,
                         const unsigned int /*face*/,
                         const unsigned int /*subface*/,
                         const Quadrature<dim-1> & /*quadrature*/,
-                        typename Mapping<dim,spacedim>::InternalDataBase & /*mapping_data*/,
-                        typename Mapping<dim,spacedim>::InternalDataBase & /*fedata*/,
+                        const typename Mapping<dim,spacedim>::InternalDataBase & /*mapping_data*/,
+                        const typename Mapping<dim,spacedim>::InternalDataBase & /*fedata*/,
                         FEValuesData<dim,spacedim> & /*data*/) const
 {
   // leave data fields empty

diff --git a/source/fe/fe_poly.cc b/source/fe/fe_poly.cc
index b6563fb3fb03b994ca6fcbbba34ca08d697079aa..cd8880af0d6387b600bf97d4011610720556db49 100644 (file)
--- a/source/fe/fe_poly.cc
+++ b/source/fe/fe_poly.cc
@@ -33,8 +33,8 @@ FE_Poly<TensorProductPolynomials<1>,1,2>::fill_fe_values
 (const Mapping<1,2>                        &mapping,
  const Triangulation<1,2>::cell_iterator   &cell,
  const Quadrature<1>                       &quadrature,
- Mapping<1,2>::InternalDataBase            &mapping_data,
- Mapping<1,2>::InternalDataBase            &fedata,
+ const Mapping<1,2>::InternalDataBase            &mapping_data,
+ const Mapping<1,2>::InternalDataBase            &fedata,
  FEValuesData<1,2>                         &data,
  CellSimilarity::Similarity           &cell_similarity) const
 {
@@ -42,8 +42,8 @@ FE_Poly<TensorProductPolynomials<1>,1,2>::fill_fe_values
   // data for this class. fails with
   // an exception if that is not
   // possible
-  Assert (dynamic_cast<InternalData *> (&fedata) != 0, ExcInternalError());
-  InternalData &fe_data = static_cast<InternalData &> (fedata);
+  Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
+  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
 
   const UpdateFlags flags(fe_data.current_update_flags());
 
@@ -71,16 +71,16 @@ FE_Poly<TensorProductPolynomials<2>,2,3>::fill_fe_values
 (const Mapping<2,3>                      &mapping,
  const Triangulation<2,3>::cell_iterator &cell,
  const Quadrature<2>                     &quadrature,
- Mapping<2,3>::InternalDataBase          &mapping_data,
- Mapping<2,3>::InternalDataBase          &fedata,
+ const Mapping<2,3>::InternalDataBase          &mapping_data,
+ const Mapping<2,3>::InternalDataBase          &fedata,
  FEValuesData<2,3>                       &data,
  CellSimilarity::Similarity         &cell_similarity) const
 {
 
   // assert that the following dynamics
   // cast is really well-defined.
-  Assert (dynamic_cast<InternalData *> (&fedata) != 0, ExcInternalError());
-  InternalData &fe_data = static_cast<InternalData &> (fedata);
+  Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
+  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
 
   const UpdateFlags flags(fe_data.current_update_flags());
 
@@ -107,8 +107,8 @@ FE_Poly<PolynomialSpace<1>,1,2>::fill_fe_values (
   const Mapping<1,2>                      &mapping,
   const Triangulation<1,2>::cell_iterator &cell,
   const Quadrature<1>                     &quadrature,
-  Mapping<1,2>::InternalDataBase          &mapping_data,
-  Mapping<1,2>::InternalDataBase          &fedata,
+  const Mapping<1,2>::InternalDataBase          &mapping_data,
+  const Mapping<1,2>::InternalDataBase          &fedata,
   FEValuesData<1,2>                       &data,
   CellSimilarity::Similarity         &cell_similarity) const
 {
@@ -117,8 +117,8 @@ FE_Poly<PolynomialSpace<1>,1,2>::fill_fe_values (
   // an exception if that is not
   // possible
 
-  Assert (dynamic_cast<InternalData *> (&fedata) != 0, ExcInternalError());
-  InternalData &fe_data = static_cast<InternalData &> (fedata);
+  Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
+  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
 
   const UpdateFlags flags(fe_data.current_update_flags());
 
@@ -145,13 +145,13 @@ FE_Poly<PolynomialSpace<2>,2,3>::fill_fe_values
 (const Mapping<2,3>                      &mapping,
  const Triangulation<2,3>::cell_iterator &cell,
  const Quadrature<2>                     &quadrature,
- Mapping<2,3>::InternalDataBase          &mapping_data,
- Mapping<2,3>::InternalDataBase          &fedata,
+ const Mapping<2,3>::InternalDataBase          &mapping_data,
+ const Mapping<2,3>::InternalDataBase          &fedata,
  FEValuesData<2,3>                       &data,
  CellSimilarity::Similarity         &cell_similarity) const
 {
-  Assert (dynamic_cast<InternalData *> (&fedata) != 0, ExcInternalError());
-  InternalData &fe_data = static_cast<InternalData &> (fedata);
+  Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
+  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
 
   const UpdateFlags flags(fe_data.current_update_flags());
 

diff --git a/source/fe/fe_poly_tensor.cc b/source/fe/fe_poly_tensor.cc
index d150565226cc1fd161a2bcf04d63e78231bae5f8..891f249094e4793239db6380d94e914fdb0f5e97 100644 (file)
--- a/source/fe/fe_poly_tensor.cc
+++ b/source/fe/fe_poly_tensor.cc
@@ -393,8 +393,8 @@ FE_PolyTensor<POLY,dim,spacedim>::fill_fe_values (
   const Mapping<dim,spacedim>                      &mapping,
   const typename Triangulation<dim,spacedim>::cell_iterator &cell,
   const Quadrature<dim>                            &quadrature,
-  typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
-  typename Mapping<dim,spacedim>::InternalDataBase &fedata,
+  const typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
+  const typename Mapping<dim,spacedim>::InternalDataBase &fedata,
   FEValuesData<dim,spacedim>                       &data,
   CellSimilarity::Similarity                  &cell_similarity) const
 {
@@ -402,9 +402,9 @@ FE_PolyTensor<POLY,dim,spacedim>::fill_fe_values (
   // data for this class. fails with
   // an exception if that is not
   // possible
-  Assert (dynamic_cast<InternalData *> (&fedata) != 0,
+  Assert (dynamic_cast<const InternalData *> (&fedata) != 0,
           ExcInternalError());
-  InternalData &fe_data = static_cast<InternalData &> (fedata);
+  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
 
   const unsigned int n_q_points = quadrature.size();
   const UpdateFlags flags(fe_data.current_update_flags());
@@ -614,17 +614,17 @@ FE_PolyTensor<POLY,dim,spacedim>::fill_fe_face_values (
   const typename Triangulation<dim,spacedim>::cell_iterator &cell,
   const unsigned int                    face,
   const Quadrature<dim-1>              &quadrature,
-  typename Mapping<dim,spacedim>::InternalDataBase       &mapping_data,
-  typename Mapping<dim,spacedim>::InternalDataBase       &fedata,
+  const typename Mapping<dim,spacedim>::InternalDataBase       &mapping_data,
+  const typename Mapping<dim,spacedim>::InternalDataBase       &fedata,
   FEValuesData<dim,spacedim>                    &data) const
 {
   // convert data object to internal
   // data for this class. fails with
   // an exception if that is not
   // possible
-  Assert (dynamic_cast<InternalData *> (&fedata) != 0,
+  Assert (dynamic_cast<const InternalData *> (&fedata) != 0,
           ExcInternalError());
-  InternalData &fe_data = static_cast<InternalData &> (fedata);
+  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
 
   const unsigned int n_q_points = quadrature.size();
   // offset determines which data set
@@ -819,17 +819,17 @@ FE_PolyTensor<POLY,dim,spacedim>::fill_fe_subface_values (
   const unsigned int                    face,
   const unsigned int                    subface,
   const Quadrature<dim-1>              &quadrature,
-  typename Mapping<dim,spacedim>::InternalDataBase       &mapping_data,
-  typename Mapping<dim,spacedim>::InternalDataBase       &fedata,
+  const typename Mapping<dim,spacedim>::InternalDataBase       &mapping_data,
+  const typename Mapping<dim,spacedim>::InternalDataBase       &fedata,
   FEValuesData<dim,spacedim>                    &data) const
 {
   // convert data object to internal
   // data for this class. fails with
   // an exception if that is not
   // possible
-  Assert (dynamic_cast<InternalData *> (&fedata) != 0,
+  Assert (dynamic_cast<const InternalData *> (&fedata) != 0,
           ExcInternalError());
-  InternalData &fe_data = static_cast<InternalData &> (fedata);
+  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
 
   const unsigned int n_q_points = quadrature.size();
 

diff --git a/source/fe/fe_system.cc b/source/fe/fe_system.cc
index d764dd6697a73889bc53f265ef42d8e86d592a5c..fcf4b88a10a533d9f6f755faead3543d14093d66 100644 (file)
--- a/source/fe/fe_system.cc
+++ b/source/fe/fe_system.cc
@@ -1037,8 +1037,8 @@ FESystem<dim,spacedim>::fill_fe_values (
   const Mapping<dim,spacedim>                      &mapping,
   const typename Triangulation<dim,spacedim>::cell_iterator &cell,
   const Quadrature<dim>                            &quadrature,
-  typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
-  typename Mapping<dim,spacedim>::InternalDataBase &fe_data,
+  const typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
+  const typename Mapping<dim,spacedim>::InternalDataBase &fe_data,
   FEValuesData<dim,spacedim>                       &data,
   CellSimilarity::Similarity                  &cell_similarity) const
 {
@@ -1055,8 +1055,8 @@ FESystem<dim,spacedim>::fill_fe_face_values (
   const typename Triangulation<dim,spacedim>::cell_iterator &cell,
   const unsigned int                    face_no,
   const Quadrature<dim-1>              &quadrature,
-  typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
-  typename Mapping<dim,spacedim>::InternalDataBase &fe_data,
+  const typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
+  const typename Mapping<dim,spacedim>::InternalDataBase &fe_data,
   FEValuesData<dim,spacedim>                    &data) const
 {
   compute_fill (mapping, cell, face_no, invalid_face_number, quadrature,
@@ -1074,8 +1074,8 @@ FESystem<dim,spacedim>::fill_fe_subface_values (
   const unsigned int                                face_no,
   const unsigned int                                sub_no,
   const Quadrature<dim-1>                          &quadrature,
-  typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
-  typename Mapping<dim,spacedim>::InternalDataBase &fe_data,
+  const typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
+  const typename Mapping<dim,spacedim>::InternalDataBase &fe_data,
   FEValuesData<dim,spacedim>                       &data) const
 {
   compute_fill (mapping, cell, face_no, sub_no, quadrature,
@@ -1094,12 +1094,12 @@ FESystem<dim,spacedim>::compute_fill_one_base (
   const unsigned int                                sub_no,
   const Quadrature<dim_1>                          &quadrature,
   CellSimilarity::Similarity                   cell_similarity,
-  typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
-  typename Mapping<dim,spacedim>::InternalDataBase &fedata,
+  const typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
+  const typename Mapping<dim,spacedim>::InternalDataBase &fedata,
   const unsigned int                                base_no,
   FEValuesData<dim,spacedim>                       &data) const
 {
-  InternalData &fe_data = static_cast<InternalData &> (fedata);
+  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
   const unsigned int n_q_points = quadrature.size();
 
   const FiniteElement<dim,spacedim> &
@@ -1243,9 +1243,9 @@ FESystem<dim,spacedim>::compute_fill (
   const unsigned int                                face_no,
   const unsigned int                                sub_no,
   const Quadrature<dim_1>                          &quadrature,
-  CellSimilarity::Similarity                   cell_similarity,
-  typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
-  typename Mapping<dim,spacedim>::InternalDataBase &fedata,
+  const CellSimilarity::Similarity                   cell_similarity,
+  const typename Mapping<dim,spacedim>::InternalDataBase &mapping_data,
+  const typename Mapping<dim,spacedim>::InternalDataBase &fedata,
   FEValuesData<dim,spacedim>                       &data) const
 {
   const unsigned int n_q_points = quadrature.size();
@@ -1254,8 +1254,8 @@ FESystem<dim,spacedim>::compute_fill (
   // data for this class. fails with
   // an exception if that is not
   // possible
-  Assert (dynamic_cast<InternalData *> (&fedata) != 0, ExcInternalError());
-  InternalData &fe_data = static_cast<InternalData &> (fedata);
+  Assert (dynamic_cast<const InternalData *> (&fedata) != 0, ExcInternalError());
+  const InternalData &fe_data = static_cast<const InternalData &> (fedata);
 
   // Either dim_1==dim
   // (fill_fe_values) or dim_1==dim-1