From b9dd958aee1c0c285e0c7c88a9c4b0919fc986a5 Mon Sep 17 00:00:00 2001
From: Marc Fehling <mafehling.git@gmail.com>
Date: Mon, 30 Nov 2020 11:46:18 -0700
Subject: [PATCH] Deprecate Legacy classes.

---
 include/deal.II/distributed/solution_transfer.h | 10 ++++------
 include/deal.II/numerics/data_out.h             |  6 ++----
 include/deal.II/numerics/data_out_dof_data.h    |  8 +++-----
 include/deal.II/numerics/data_out_faces.h       |  7 +++----
 include/deal.II/numerics/data_out_rotation.h    |  9 ++++-----
 include/deal.II/numerics/fe_field_function.h    |  8 +++-----
 include/deal.II/numerics/solution_transfer.h    |  8 +++-----
 7 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/include/deal.II/distributed/solution_transfer.h b/include/deal.II/distributed/solution_transfer.h
index c1ae3d04b4..02706b2b2a 100644
--- a/include/deal.II/distributed/solution_transfer.h
+++ b/include/deal.II/distributed/solution_transfer.h
@@ -382,16 +382,14 @@ namespace Legacy
     namespace distributed
     {
       /**
-       * The template arguments of the original
-       * dealii::parallel::distributed::SolutionTransfer class will change in a
-       * future release. If for some reason, you need a code that is compatible
-       * with deal.II 9.3 and the subsequent release, use this alias instead.
+       * @deprecated Use dealii::parallel::distributed::SolutionTransfer
+       * without the DoFHandlerType template instead.
        */
       template <int dim,
                 typename VectorType,
                 typename DoFHandlerType = DoFHandler<dim>>
-      using SolutionTransfer = dealii::parallel::distributed::
-        SolutionTransfer<dim, VectorType, DoFHandlerType>;
+      using SolutionTransfer DEAL_II_DEPRECATED = dealii::parallel::
+        distributed::SolutionTransfer<dim, VectorType, DoFHandlerType>;
     } // namespace distributed
   }   // namespace parallel
 } // namespace Legacy
diff --git a/include/deal.II/numerics/data_out.h b/include/deal.II/numerics/data_out.h
index 5a3278274c..1541b24a92 100644
--- a/include/deal.II/numerics/data_out.h
+++ b/include/deal.II/numerics/data_out.h
@@ -519,13 +519,11 @@ private:
 namespace Legacy
 {
   /**
-   * The template arguments of the original dealii::DataOut class will
-   * change in a future release. If for some reason, you need a code that is
-   * compatible with deal.II 9.3 and the subsequent release, use this alias
+   * @deprecated Use dealii::DataOut without the DoFHandlerType template
    * instead.
    */
   template <int dim, typename DoFHandlerType = DoFHandler<dim>>
-  using DataOut = dealii::DataOut<dim, DoFHandlerType>;
+  using DataOut DEAL_II_DEPRECATED = dealii::DataOut<dim, DoFHandlerType>;
 } // namespace Legacy
 
 
diff --git a/include/deal.II/numerics/data_out_dof_data.h b/include/deal.II/numerics/data_out_dof_data.h
index a10fe588a2..e0e192bd16 100644
--- a/include/deal.II/numerics/data_out_dof_data.h
+++ b/include/deal.II/numerics/data_out_dof_data.h
@@ -1246,15 +1246,13 @@ DataOut_DoFData<DoFHandlerType, patch_dim, patch_space_dim>::merge_patches(
 namespace Legacy
 {
   /**
-   * The template arguments of the original dealii::DataOut_DoFData class will
-   * change in a future release. If for some reason, you need a code that is
-   * compatible with deal.II 9.3 and the subsequent release, use this alias
-   * instead.
+   * @deprecated Use dealii::DataOut_DoFData without the DoFHandlerType
+   * template instead.
    */
   template <typename DoFHandlerType,
             int patch_dim,
             int patch_space_dim = patch_dim>
-  using DataOut_DoFData =
+  using DataOut_DoFData DEAL_II_DEPRECATED =
     dealii::DataOut_DoFData<DoFHandlerType, patch_dim, patch_space_dim>;
 } // namespace Legacy
 
diff --git a/include/deal.II/numerics/data_out_faces.h b/include/deal.II/numerics/data_out_faces.h
index e7061519cf..2e0cbff450 100644
--- a/include/deal.II/numerics/data_out_faces.h
+++ b/include/deal.II/numerics/data_out_faces.h
@@ -253,13 +253,12 @@ private:
 namespace Legacy
 {
   /**
-   * The template arguments of the original dealii::DataOutFaces class will
-   * change in a future release. If for some reason, you need a code that is
-   * compatible with deal.II 9.3 and the subsequent release, use this alias
+   * @deprecated Use dealii::DataOutFaces without the DoFHandlerType template
    * instead.
    */
   template <int dim, typename DoFHandlerType = DoFHandler<dim>>
-  using DataOutFaces = dealii::DataOutFaces<dim, DoFHandlerType>;
+  using DataOutFaces DEAL_II_DEPRECATED =
+    dealii::DataOutFaces<dim, DoFHandlerType>;
 } // namespace Legacy
 
 
diff --git a/include/deal.II/numerics/data_out_rotation.h b/include/deal.II/numerics/data_out_rotation.h
index 93f47ee405..f267987375 100644
--- a/include/deal.II/numerics/data_out_rotation.h
+++ b/include/deal.II/numerics/data_out_rotation.h
@@ -218,13 +218,12 @@ private:
 namespace Legacy
 {
   /**
-   * The template arguments of the original dealii::DataOutRotation class will
-   * change in a future release. If for some reason, you need a code that is
-   * compatible with deal.II 9.3 and the subsequent release, use this alias
-   * instead.
+   * @deprecated Use dealii::DataOutRotation without the DoFHandlerType
+   * template instead.
    */
   template <int dim, typename DoFHandlerType = DoFHandler<dim>>
-  using DataOutRotation = dealii::DataOutRotation<dim, DoFHandlerType>;
+  using DataOutRotation DEAL_II_DEPRECATED =
+    dealii::DataOutRotation<dim, DoFHandlerType>;
 } // namespace Legacy
 
 
diff --git a/include/deal.II/numerics/fe_field_function.h b/include/deal.II/numerics/fe_field_function.h
index 54db129796..c70fddbdcf 100644
--- a/include/deal.II/numerics/fe_field_function.h
+++ b/include/deal.II/numerics/fe_field_function.h
@@ -494,15 +494,13 @@ namespace Legacy
   namespace Functions
   {
     /**
-     * The template arguments of the original dealii::Functions::FEFieldFunction
-     * class will change in a future release. If for some reason, you need a
-     * code that is compatible with deal.II 9.3 and the subsequent release, use
-     * this alias instead.
+     * @deprecated Use dealii::Functions::FEFieldFunction without the
+     * DoFHandlerType template instead.
      */
     template <int dim,
               typename DoFHandlerType = DoFHandler<dim>,
               typename VectorType     = Vector<double>>
-    using FEFieldFunction =
+    using FEFieldFunction DEAL_II_DEPRECATED =
       dealii::Functions::FEFieldFunction<dim, DoFHandlerType, VectorType>;
   } // namespace Functions
 } // namespace Legacy
diff --git a/include/deal.II/numerics/solution_transfer.h b/include/deal.II/numerics/solution_transfer.h
index 4a124e1a1e..9efc94d621 100644
--- a/include/deal.II/numerics/solution_transfer.h
+++ b/include/deal.II/numerics/solution_transfer.h
@@ -577,15 +577,13 @@ private:
 namespace Legacy
 {
   /**
-   * The template arguments of the original dealii::SolutionTransfer class will
-   * change in a future release. If for some reason, you need a code that is
-   * compatible with deal.II 9.3 and the subsequent release, use this alias
-   * instead.
+   * @deprecated Use dealii::SolutionTransfer without the DoFHandlerType
+   * template instead.
    */
   template <int dim,
             typename VectorType     = Vector<double>,
             typename DoFHandlerType = DoFHandler<dim>>
-  using SolutionTransfer =
+  using SolutionTransfer DEAL_II_DEPRECATED =
     dealii::SolutionTransfer<dim, VectorType, DoFHandlerType>;
 } // namespace Legacy
 
-- 
2.39.5