From 22b370c3e9d193a2481c1201578fc3caddb9430c Mon Sep 17 00:00:00 2001
From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Sun, 25 Jan 2015 12:53:07 -0600
Subject: [PATCH] Remove deprecated classes FEEvaluationGeneral and
 FEEvaluationGL.

---
 doc/news/changes.h                          |  1 +
 include/deal.II/matrix_free/fe_evaluation.h | 62 ---------------------
 2 files changed, 1 insertion(+), 62 deletions(-)

diff --git a/doc/news/changes.h b/doc/news/changes.h
index 54a4a484c2..da7379865d 100644
--- a/doc/news/changes.h
+++ b/doc/news/changes.h
@@ -208,6 +208,7 @@ inconvenience this causes.
   - MGTools::extract_inner_interface_dofs.
   - Class MGMatrix.
   - Multigrid::vmult and friends.
+  - Classes FEEvaluationGeneral and FEEvaluationGL.
   <br>
   This release also removes the deprecated class MGDoFHandler. The
   functionality of this class had previously been incorporated into
diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h
index 9b4df70e3b..0ed7c6b86d 100644
--- a/include/deal.II/matrix_free/fe_evaluation.h
+++ b/include/deal.II/matrix_free/fe_evaluation.h
@@ -1690,68 +1690,6 @@ private:
 
 
 
-/**
- * Deprecated. Functionality has been merged into FEEvaluation. Use class
- * FEEvaluation instead.
- */
-template <int dim, int fe_degree, int n_q_points_1d = fe_degree+1,
-          int n_components_ = 1, typename Number = double >
-class FEEvaluationGeneral : public FEEvaluation<dim, fe_degree, n_q_points_1d, n_components_,Number>
-{
-public:
-  typedef FEEvaluation<dim, fe_degree, n_q_points_1d, n_components_, Number> BaseClass;
-  typedef Number                            number_type;
-  typedef typename BaseClass::value_type    value_type;
-  typedef typename BaseClass::gradient_type gradient_type;
-  static const unsigned int dimension     = dim;
-  static const unsigned int n_components  = n_components_;
-  static const unsigned int dofs_per_cell = Utilities::fixed_int_power<fe_degree+1,dim>::value;
-  static const unsigned int n_q_points    = Utilities::fixed_int_power<n_q_points_1d,dim>::value;
-
-  /**
-   * Constructor.
-   */
-  FEEvaluationGeneral (const MatrixFree<dim,Number> &matrix_free,
-                       const unsigned int            fe_no   = 0,
-                       const unsigned int            quad_no = 0) DEAL_II_DEPRECATED
-:
-  BaseClass (matrix_free, fe_no, quad_no)
-  {}
-};
-
-
-
-/**
- * Deprecated. Functionality has been merged into FEEvaluation. Use class
- * FEEvaluation instead.
- */
-template <int dim, int fe_degree, int n_components_ = 1, typename Number = double >
-class FEEvaluationGL :
-  public FEEvaluation<dim,fe_degree,fe_degree+1,n_components_,Number>
-{
-public:
-  typedef FEEvaluation<dim,fe_degree,fe_degree+1,n_components_,Number> BaseClass;
-  typedef Number                            number_type;
-  typedef typename BaseClass::value_type    value_type;
-  typedef typename BaseClass::gradient_type gradient_type;
-  static const unsigned int dimension     = dim;
-  static const unsigned int n_components  = n_components_;
-  static const unsigned int dofs_per_cell = Utilities::fixed_int_power<fe_degree+1,dim>::value;
-  static const unsigned int n_q_points    = BaseClass::n_q_points;
-
-  /**
-   * Constructor.
-   */
-  FEEvaluationGL (const MatrixFree<dim,Number> &matrix_free,
-                  const unsigned int          fe_no   = 0,
-                  const unsigned int          quad_no = 0) DEAL_II_DEPRECATED
-:
-  BaseClass (matrix_free, fe_no, quad_no)
-  {}
-};
-
-
-
 namespace internal
 {
   namespace MatrixFreeFunctions
-- 
2.39.5