From 2dc47c2edfa85d1f1d59ffc78116fcec9e15a804 Mon Sep 17 00:00:00 2001 From: young Date: Fri, 14 Feb 2014 12:16:54 +0000 Subject: [PATCH] Remove a badly introduced over zealous instantiation. git-svn-id: https://svn.dealii.org/branches/branch_petscscalar_complex@32485 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/fe/fe_values.decl.1.inst.in | 25 ++++++++++++++----- deal.II/source/fe/fe_values.decl.2.inst.in | 28 +++++++++++++++------- 2 files changed, 38 insertions(+), 15 deletions(-) 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 9ec59b45a1..6cbab13c8f 100644 --- 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 : REAL_SERIAL_VECTORS; S : REAL_SCALARS) +for (VEC : REAL_SERIAL_VECTORS) { /// Call /// @p get_interpolated_dof_values @@ -28,10 +28,10 @@ for (VEC : REAL_SERIAL_VECTORS; S : REAL_SCALARS) virtual void get_interpolated_dof_values (const VEC &in, - Vector &out) const = 0; + Vector &out) const = 0; } - -for (VEC : COMPLEX_SERIAL_VECTORS; S : COMPLEX_SCALARS) + +for (VEC : SERIAL_VECTORS_COMPLEX) { /// Call /// @p get_interpolated_dof_values @@ -39,6 +39,19 @@ for (VEC : COMPLEX_SERIAL_VECTORS; S : COMPLEX_SCALARS) /// given arguments. virtual void - get_interpolated_dof_values (const VEC &in, + get_interpolated_dof_values (const VEC &in, Vector > &out) const = 0; - } + } + +for (S: SCALARS) + { + /// Call + /// @p get_interpolated_dof_values + /// of the iterator with the + /// given arguments. + virtual + void + get_interpolated_dof_values (const IndexSet &in, + Vector &out) const = 0; + } + 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 03d8b5cf89..f676fad32a 100644 --- 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 : REAL_SERIAL_VECTORS; S : REAL_SCALARS) +for (VEC : REAL_SERIAL_VECTORS) { /// Call /// @p get_interpolated_dof_values @@ -27,18 +27,28 @@ for (VEC : REAL_SERIAL_VECTORS; S : REAL_SCALARS) /// given arguments. virtual void - get_interpolated_dof_values (const VEC &in, - Vector &out) const; - } - -for (VEC : COMPLEX_SERIAL_VECTORS) + get_interpolated_dof_values (const VEC &in, + Vector &out) const; + } + +for (VEC : SERIAL_VECTORS_COMPLEX) { /// Call /// @p get_interpolated_dof_values - /// of the iterator with the + /// of the iterator with the /// given arguments. virtual void - get_interpolated_dof_values (const VEC &in, + get_interpolated_dof_values (const VEC &in, Vector > &out) const; - } + } + +for (S: SCALARS) + { + + virtual + void + get_interpolated_dof_values (const IndexSet &in, + Vector &out) const; + } + \ No newline at end of file -- 2.39.5