Rename a class.

diff --git a/include/deal.II/fe/fe_values_base.h b/include/deal.II/fe/fe_values_base.h
index 1efce2e36dff9eb958e21819e0ff065e31d4f327..fd65b76a3b738627d8540d4c05726a813faac6ff 100644 (file)
--- a/include/deal.II/fe/fe_values_base.h
+++ b/include/deal.II/fe/fe_values_base.h
@@ -1559,7 +1559,7 @@ protected:
    * degrees of freedom on this cell in the get_function_values() and assorted
    * functions.
    */
-  class CellIteratorContainer
+  class CellIteratorWrapper
   {
   public:
     DeclExceptionMsg(
@@ -1576,24 +1576,24 @@ protected:
      * Constructor. Creates an unusable object that is not associated with
      * any cell at all.
      */
-    CellIteratorContainer() = default;
+    CellIteratorWrapper() = default;
 
     /**
      * Constructor.
      */
-    CellIteratorContainer(
+    CellIteratorWrapper(
       const typename Triangulation<dim, spacedim>::cell_iterator &cell);
 
     /**
      * Constructor.
      */
-    CellIteratorContainer(
+    CellIteratorWrapper(
       const typename DoFHandler<dim, spacedim>::cell_iterator &cell);
 
     /**
      * Constructor.
      */
-    CellIteratorContainer(
+    CellIteratorWrapper(
       const typename DoFHandler<dim, spacedim>::level_cell_iterator &cell);
 
     /**
@@ -1644,7 +1644,7 @@ protected:
    * is necessary for the <tt>get_function_*</tt> functions as well as the
    * functions of same name in the extractor classes.
    */
-  CellIteratorContainer present_cell;
+  CellIteratorWrapper present_cell;
 
   /**
    * A signal connection we use to ensure we get informed whenever the

diff --git a/source/fe/fe_values_base.cc b/source/fe/fe_values_base.cc
index 0531f1ce9242a21407be527f08c7f554d73ba1c3..ed622161dbc4fc7073dc9af28e064ca02df11664 100644 (file)
--- a/source/fe/fe_values_base.cc
+++ b/source/fe/fe_values_base.cc
@@ -105,11 +105,11 @@ namespace internal
   } // namespace
 } // namespace internal
 
-/* ------------ FEValuesBase<dim,spacedim>::CellIteratorContainer ----------- */
+/* ------------ FEValuesBase<dim,spacedim>::CellIteratorWrapper ----------- */
 
 
 template <int dim, int spacedim>
-FEValuesBase<dim, spacedim>::CellIteratorContainer::CellIteratorContainer(
+FEValuesBase<dim, spacedim>::CellIteratorWrapper::CellIteratorWrapper(
   const typename Triangulation<dim, spacedim>::cell_iterator &cell)
   : cell(cell)
 {}
@@ -117,7 +117,7 @@ FEValuesBase<dim, spacedim>::CellIteratorContainer::CellIteratorContainer(
 
 
 template <int dim, int spacedim>
-FEValuesBase<dim, spacedim>::CellIteratorContainer::CellIteratorContainer(
+FEValuesBase<dim, spacedim>::CellIteratorWrapper::CellIteratorWrapper(
   const typename DoFHandler<dim, spacedim>::cell_iterator &cell)
   : cell(cell)
 {}
@@ -125,7 +125,7 @@ FEValuesBase<dim, spacedim>::CellIteratorContainer::CellIteratorContainer(
 
 
 template <int dim, int spacedim>
-FEValuesBase<dim, spacedim>::CellIteratorContainer::CellIteratorContainer(
+FEValuesBase<dim, spacedim>::CellIteratorWrapper::CellIteratorWrapper(
   const typename DoFHandler<dim, spacedim>::level_cell_iterator &cell)
   : cell(cell)
 {}
@@ -134,7 +134,7 @@ FEValuesBase<dim, spacedim>::CellIteratorContainer::CellIteratorContainer(
 
 template <int dim, int spacedim>
 bool
-FEValuesBase<dim, spacedim>::CellIteratorContainer::is_initialized() const
+FEValuesBase<dim, spacedim>::CellIteratorWrapper::is_initialized() const
 {
   return cell.has_value();
 }
@@ -142,7 +142,7 @@ FEValuesBase<dim, spacedim>::CellIteratorContainer::is_initialized() const
 
 
 template <int dim, int spacedim>
-FEValuesBase<dim, spacedim>::CellIteratorContainer::
+FEValuesBase<dim, spacedim>::CellIteratorWrapper::
 operator typename Triangulation<dim, spacedim>::cell_iterator() const
 {
   Assert(is_initialized(), ExcNotReinited());
@@ -161,8 +161,7 @@ operator typename Triangulation<dim, spacedim>::cell_iterator() const
 
 template <int dim, int spacedim>
 types::global_dof_index
-FEValuesBase<dim, spacedim>::CellIteratorContainer::n_dofs_for_dof_handler()
-  const
+FEValuesBase<dim, spacedim>::CellIteratorWrapper::n_dofs_for_dof_handler() const
 {
   Assert(is_initialized(), ExcNotReinited());
 
@@ -183,7 +182,7 @@ FEValuesBase<dim, spacedim>::CellIteratorContainer::n_dofs_for_dof_handler()
 template <int dim, int spacedim>
 template <typename Number>
 void
-FEValuesBase<dim, spacedim>::CellIteratorContainer::get_interpolated_dof_values(
+FEValuesBase<dim, spacedim>::CellIteratorWrapper::get_interpolated_dof_values(
   const ReadVector<Number> &in,
   Vector<Number>           &out) const
 {

diff --git a/source/fe/fe_values_base.inst.in b/source/fe/fe_values_base.inst.in
index 012d897f660b6a0da156b47982da7135aaa00200..6469dab267fab67571ed0359eab56bb36f77925f 100644 (file)
--- a/source/fe/fe_values_base.inst.in
+++ b/source/fe/fe_values_base.inst.in
@@ -27,8 +27,8 @@ for (S : REAL_AND_COMPLEX_SCALARS; deal_II_dimension : DIMENSIONS;
   {
 #  if deal_II_dimension <= deal_II_space_dimension
     template void FEValuesBase<deal_II_dimension, deal_II_space_dimension>::
-      CellIteratorContainer::get_interpolated_dof_values<S>(
-        const ReadVector<S> &, Vector<S> &) const;
+      CellIteratorWrapper::get_interpolated_dof_values<S>(const ReadVector<S> &,
+                                                          Vector<S> &) const;
 #  endif
   }