Use FEValuesType, not FEValues, in templates.

This makes things less ambiguous because 'FEValues' is a valid class
name.

diff --git a/include/deal.II/hp/fe_values.h b/include/deal.II/hp/fe_values.h
index 3093d11267998eb6dd575cb1d7a4856840481292..936499d23f271c0391dead7666ca37984c87ae46 100644 (file)
--- a/include/deal.II/hp/fe_values.h
+++ b/include/deal.II/hp/fe_values.h
@@ -56,7 +56,7 @@ namespace internal
      *
      * @author Wolfgang Bangerth, 2003
      */
-    template <int dim, int q_dim, class FEValues>
+    template <int dim, int q_dim, class FEValuesType>
     class FEValuesBase
     {
     public:
@@ -64,16 +64,16 @@ namespace internal
        * Constructor. Set the fields of this class to the values indicated by
        * the parameters to the constructor.
        */
-      FEValuesBase (const dealii::hp::MappingCollection<dim,FEValues::space_dimension> &mapping_collection,
-                    const dealii::hp::FECollection<dim,FEValues::space_dimension>      &fe_collection,
+      FEValuesBase (const dealii::hp::MappingCollection<dim,FEValuesType::space_dimension> &mapping_collection,
+                    const dealii::hp::FECollection<dim,FEValuesType::space_dimension>      &fe_collection,
                     const dealii::hp::QCollection<q_dim>     &q_collection,
-                    const UpdateFlags             update_flags);
+                    const dealii::UpdateFlags             update_flags);
       /**
        * Constructor. This constructor is equivalent to the other one except
        * that it makes the object use a $Q_1$ mapping (i.e., an object of
        * type MappingQGeneric(1)) implicitly.
        */
-      FEValuesBase (const dealii::hp::FECollection<dim,FEValues::space_dimension> &fe_collection,
+      FEValuesBase (const dealii::hp::FECollection<dim,FEValuesType::space_dimension> &fe_collection,
                     const dealii::hp::QCollection<q_dim> &q_collection,
                     const UpdateFlags         update_flags);
 
@@ -81,13 +81,13 @@ namespace internal
        * Get a reference to the collection of finite element objects used
        * here.
        */
-      const dealii::hp::FECollection<dim,FEValues::space_dimension> &
+      const dealii::hp::FECollection<dim,FEValuesType::space_dimension> &
       get_fe_collection () const;
 
       /**
        * Get a reference to the collection of mapping objects used here.
        */
-      const dealii::hp::MappingCollection<dim,FEValues::space_dimension> &
+      const dealii::hp::MappingCollection<dim,FEValuesType::space_dimension> &
       get_mapping_collection () const;
 
       /**
@@ -107,7 +107,7 @@ namespace internal
        * you called the @p reinit function of the <tt>hp::FE*Values</tt> class
        * the last time.
        */
-      const FEValues &get_present_fe_values () const;
+      const FEValuesType &get_present_fe_values () const;
 
     protected:
 
@@ -118,7 +118,7 @@ namespace internal
        * The function returns a writable reference so that derived classes can
        * also reinit() the selected FEValues object.
        */
-      FEValues &
+      FEValuesType &
       select_fe_values (const unsigned int fe_index,
                         const unsigned int mapping_index,
                         const unsigned int q_index);
@@ -127,14 +127,14 @@ namespace internal
       /**
        * A pointer to the collection of finite elements to be used.
        */
-      const SmartPointer<const dealii::hp::FECollection<dim,FEValues::space_dimension>,
-            FEValuesBase<dim,q_dim,FEValues> > fe_collection;
+      const SmartPointer<const dealii::hp::FECollection<dim,FEValuesType::space_dimension>,
+            FEValuesBase<dim,q_dim,FEValuesType> > fe_collection;
 
       /**
        * A pointer to the collection of mappings to be used.
        */
-      const SmartPointer<const dealii::hp::MappingCollection<dim, FEValues::space_dimension>,
-            FEValuesBase<dim,q_dim,FEValues> > mapping_collection;
+      const SmartPointer<const dealii::hp::MappingCollection<dim, FEValuesType::space_dimension>,
+            FEValuesBase<dim,q_dim,FEValuesType> > mapping_collection;
 
       /**
        * Copy of the quadrature collection object provided to the constructor.
@@ -153,7 +153,7 @@ namespace internal
        * Initially, all entries have zero pointers, and we will allocate them
        * lazily as needed in select_fe_values().
        */
-      dealii::Table<3,std_cxx11::shared_ptr<FEValues> > fe_values_table;
+      dealii::Table<3,std_cxx11::shared_ptr<FEValuesType> > fe_values_table;
 
       /**
        * Set of indices pointing at the fe_values object selected last time
@@ -595,50 +595,50 @@ namespace internal
 {
   namespace hp
   {
-    template <int dim, int q_dim, class FEValues>
+    template <int dim, int q_dim, class FEValuesType>
     inline
-    const FEValues &
-    FEValuesBase<dim,q_dim,FEValues>::get_present_fe_values () const
+    const FEValuesType &
+    FEValuesBase<dim,q_dim,FEValuesType>::get_present_fe_values () const
     {
       return *fe_values_table(present_fe_values_index);
     }
 
 
 
-    template <int dim, int q_dim, class FEValues>
+    template <int dim, int q_dim, class FEValuesType>
     inline
-    const dealii::hp::FECollection<dim,FEValues::space_dimension> &
-    FEValuesBase<dim,q_dim,FEValues>::get_fe_collection () const
+    const dealii::hp::FECollection<dim,FEValuesType::space_dimension> &
+    FEValuesBase<dim,q_dim,FEValuesType>::get_fe_collection () const
     {
       return *fe_collection;
     }
 
 
 
-    template <int dim, int q_dim, class FEValues>
+    template <int dim, int q_dim, class FEValuesType>
     inline
-    const dealii::hp::MappingCollection<dim,FEValues::space_dimension> &
-    FEValuesBase<dim,q_dim,FEValues>::get_mapping_collection () const
+    const dealii::hp::MappingCollection<dim,FEValuesType::space_dimension> &
+    FEValuesBase<dim,q_dim,FEValuesType>::get_mapping_collection () const
     {
       return *mapping_collection;
     }
 
 
 
-    template <int dim, int q_dim, class FEValues>
+    template <int dim, int q_dim, class FEValuesType>
     inline
     const dealii::hp::QCollection<q_dim> &
-    FEValuesBase<dim,q_dim,FEValues>::get_quadrature_collection () const
+    FEValuesBase<dim,q_dim,FEValuesType>::get_quadrature_collection () const
     {
       return q_collection;
     }
 
 
 
-    template <int dim, int q_dim, class FEValues>
+    template <int dim, int q_dim, class FEValuesType>
     inline
     dealii::UpdateFlags
-    FEValuesBase<dim,q_dim,FEValues>::get_update_flags () const
+    FEValuesBase<dim,q_dim,FEValuesType>::get_update_flags () const
     {
       return update_flags;
     }

diff --git a/source/hp/fe_values.cc b/source/hp/fe_values.cc
index c1c17da9568c083c655645462edd9319753a3b44..d86382ad2442b1b7a073a257ca34bef8fc4975c7 100644 (file)
--- a/source/hp/fe_values.cc
+++ b/source/hp/fe_values.cc
@@ -25,12 +25,12 @@ namespace internal
   {
 // -------------------------- FEValuesBase -------------------------
 
-    template <int dim, int q_dim, class FEValues>
-    FEValuesBase<dim,q_dim,FEValues>::
-    FEValuesBase (const dealii::hp::MappingCollection<dim,FEValues::space_dimension> &mapping_collection,
-                  const dealii::hp::FECollection<dim,FEValues::space_dimension>      &fe_collection,
-                  const dealii::hp::QCollection<q_dim>     &q_collection,
-                  const UpdateFlags                   update_flags)
+    template <int dim, int q_dim, class FEValuesType>
+    FEValuesBase<dim,q_dim,FEValuesType>::FEValuesBase
+    (const dealii::hp::MappingCollection<dim,FEValuesType::space_dimension> &mapping_collection,
+     const dealii::hp::FECollection<dim,FEValuesType::space_dimension>      &fe_collection,
+     const dealii::hp::QCollection<q_dim>                                   &q_collection,
+     const UpdateFlags                                                       update_flags)
       :
       fe_collection (&fe_collection),
       mapping_collection (&mapping_collection),
@@ -45,14 +45,14 @@ namespace internal
     {}
 
 
-    template <int dim, int q_dim, class FEValues>
-    FEValuesBase<dim,q_dim,FEValues>::
-    FEValuesBase (const dealii::hp::FECollection<dim,FEValues::space_dimension>      &fe_collection,
-                  const dealii::hp::QCollection<q_dim> &q_collection,
-                  const UpdateFlags         update_flags)
+    template <int dim, int q_dim, class FEValuesType>
+    FEValuesBase<dim,q_dim,FEValuesType>::FEValuesBase
+    (const dealii::hp::FECollection<dim,FEValuesType::space_dimension> &fe_collection,
+     const dealii::hp::QCollection<q_dim>                              &q_collection,
+     const UpdateFlags                                                  update_flags)
       :
       fe_collection (&fe_collection),
-      mapping_collection (&dealii::hp::StaticMappingQ1<dim,FEValues::space_dimension>::
+      mapping_collection (&dealii::hp::StaticMappingQ1<dim,FEValuesType::space_dimension>::
                           mapping_collection),
       q_collection (q_collection),
       fe_values_table (fe_collection.size(),
@@ -66,12 +66,12 @@ namespace internal
 
 
 
-    template <int dim, int q_dim, class FEValues>
-    FEValues &
-    FEValuesBase<dim,q_dim,FEValues>::
-    select_fe_values (const unsigned int fe_index,
-                      const unsigned int mapping_index,
-                      const unsigned int q_index)
+    template <int dim, int q_dim, class FEValuesType>
+    FEValuesType &
+    FEValuesBase<dim,q_dim,FEValuesType>::select_fe_values
+    (const unsigned int fe_index,
+     const unsigned int mapping_index,
+     const unsigned int q_index)
     {
       Assert (fe_index < fe_collection->size(),
               ExcIndexRange (fe_index, 0, fe_collection->size()));
@@ -94,11 +94,11 @@ namespace internal
       if (fe_values_table(present_fe_values_index).get() == 0)
         fe_values_table(present_fe_values_index)
           =
-            std_cxx11::shared_ptr<FEValues>
-            (new FEValues ((*mapping_collection)[mapping_index],
-                           (*fe_collection)[fe_index],
-                           q_collection[q_index],
-                           update_flags));
+            std_cxx11::shared_ptr<FEValuesType>
+            (new FEValuesType ((*mapping_collection)[mapping_index],
+                               (*fe_collection)[fe_index],
+                               q_collection[q_index],
+                               update_flags));
 
       // now there definitely is one!
       return *fe_values_table(present_fe_values_index);