fixed wrong template names used to instantiate fe_values

git-svn-id: https://svn.dealii.org/branches/branch_petscscalar_complex@32618 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/source/fe/fe_values.decl.1.inst.in b/deal.II/source/fe/fe_values.decl.1.inst.in
index 99a4856d0891663ad4cff82c95910b8e3bcd27b1..7d5a6035964d068f7cb95860d6eeb55a35d0bf8c 100644 (file)
--- a/deal.II/source/fe/fe_values.decl.1.inst.in
+++ b/deal.II/source/fe/fe_values.decl.1.inst.in
@@ -19,7 +19,7 @@
 // Declarations of member functions of FEValuesBase::CellIteratorBase
 // and derived classes
 
-for (VEC : SERIAL_VECTORS_REAL; S: REAL_SCALARS)
+for (VEC : REAL_SERIAL_VECTORS; S: REAL_SCALARS)
   {
                                      /// Call
                                      /// @p get_interpolated_dof_values
@@ -31,7 +31,7 @@ for (VEC : SERIAL_VECTORS_REAL; S: REAL_SCALARS)
                                 Vector<S> &out) const = 0;
   }
   
-for (VEC : SERIAL_VECTORS_COMPLEX)
+for (VEC : COMPLEX_SERIAL_VECTORS)
   {
                                      /// Call
                                      /// @p get_interpolated_dof_values

diff --git a/deal.II/source/fe/fe_values.decl.2.inst.in b/deal.II/source/fe/fe_values.decl.2.inst.in
index 6a26e8e72f9280b37138b04b74fad83a7f5816c4..0d40b9d98e8508aab0c6ad871a7e90ee92f6d20d 100644 (file)
--- a/deal.II/source/fe/fe_values.decl.2.inst.in
+++ b/deal.II/source/fe/fe_values.decl.2.inst.in
@@ -19,7 +19,7 @@
 // Declarations of member functions of FEValuesBase::CellIteratorBase
 // and derived classes
 
-for (VEC : SERIAL_VECTORS_REAL; S: REAL_SCALARS)
+for (VEC : REAL_SERIAL_VECTORS; S: REAL_SCALARS)
   {
                                      /// Call
                                      /// @p get_interpolated_dof_values
@@ -31,7 +31,7 @@ for (VEC : SERIAL_VECTORS_REAL; S: REAL_SCALARS)
                                 Vector<S> &out) const;
   }  
   
-for (VEC : SERIAL_VECTORS_COMPLEX)
+for (VEC : COMPLEX_SERIAL_VECTORS)
   {
                                      /// Call
                                      /// @p get_interpolated_dof_values

diff --git a/deal.II/source/fe/fe_values.impl.1.inst.in b/deal.II/source/fe/fe_values.impl.1.inst.in
index 96d4ee678bc935a6cb70939058febda233dad179..7c264ea94bd387e72d9399510bfe4969eecfd04f 100644 (file)
--- a/deal.II/source/fe/fe_values.impl.1.inst.in
+++ b/deal.II/source/fe/fe_values.impl.1.inst.in
@@ -15,7 +15,7 @@
 // ---------------------------------------------------------------------
 
 
-for (VEC : SERIAL_VECTORS_REAL; S: REAL_SCALARS)
+for (VEC : REAL_SERIAL_VECTORS; S: REAL_SCALARS)
   {
     template <int dim, int spacedim>
     template <typename CI>
@@ -28,7 +28,7 @@ for (VEC : SERIAL_VECTORS_REAL; S: REAL_SCALARS)
     \}
   }
   
-for (VEC : SERIAL_VECTORS_COMPLEX)
+for (VEC : COMPLEX_SERIAL_VECTORS)
   {
     template <int dim, int spacedim>
     template <typename CI>

diff --git a/deal.II/source/fe/fe_values.impl.2.inst.in b/deal.II/source/fe/fe_values.impl.2.inst.in
index 368c147d48032609142df077dd97e1df9d6acda8..1d9b4b714e61cf543057b17c004c70656790a152 100644 (file)
--- a/deal.II/source/fe/fe_values.impl.2.inst.in
+++ b/deal.II/source/fe/fe_values.impl.2.inst.in
@@ -15,7 +15,7 @@
 // ---------------------------------------------------------------------
 
 
-for (VEC : SERIAL_VECTORS_REAL; S: REAL_SCALARS)
+for (VEC : REAL_SERIAL_VECTORS; S: REAL_SCALARS)
   {
     template <int dim, int spacedim>
     void
@@ -27,7 +27,7 @@ for (VEC : SERIAL_VECTORS_REAL; S: REAL_SCALARS)
     \}
   }
   
-for (VEC : SERIAL_VECTORS_COMPLEX)
+for (VEC : COMPLEX_SERIAL_VECTORS)
   {
     template <int dim, int spacedim>
     void

diff --git a/deal.II/source/fe/fe_values.inst.in b/deal.II/source/fe/fe_values.inst.in
index be28a920845ef7f3d87be31d8b4caf4bb93dc0d0..24d7a11837b5b948001b4e50158325d48d7ada78 100644 (file)
--- a/deal.II/source/fe/fe_values.inst.in
+++ b/deal.II/source/fe/fe_values.inst.in
@@ -64,7 +64,7 @@ for (dof_handler : DOFHANDLER_TEMPLATES; deal_II_dimension : DIMENSIONS; deal_II
 
 
 
-for (VEC : SERIAL_VECTORS_REAL; deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS)
+for (VEC : REAL_SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS)
   {
 #if deal_II_dimension <= deal_II_space_dimension
 #if (deal_II_space_dimension == DIM_A) || (deal_II_space_dimension == DIM_B)
@@ -137,7 +137,7 @@ for (VEC : SERIAL_VECTORS_REAL; deal_II_dimension : DIMENSIONS; deal_II_space_di
 
 
 
-for (VEC : SERIAL_VECTORS_REAL; deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS)
+for (VEC : REAL_SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS)
   {
 #if deal_II_dimension <= deal_II_space_dimension
 #if (deal_II_space_dimension == DIM_A) || (deal_II_space_dimension == DIM_B)
@@ -254,7 +254,7 @@ for (VEC : SERIAL_VECTORS_REAL; deal_II_dimension : DIMENSIONS; deal_II_space_di
 #endif
   }
 
-for (VEC : SERIAL_VECTORS_COMPLEX; deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS)
+for (VEC : COMPLEX_SERIAL_VECTORS; deal_II_dimension : DIMENSIONS; deal_II_space_dimension :  SPACE_DIMENSIONS)
   {
 #if deal_II_dimension <= deal_II_space_dimension
 #if (deal_II_space_dimension == DIM_A) || (deal_II_space_dimension == DIM_B)