switch DEAL_II_DEPRECATED_EARLY over to DEAL_II_DEPRECATED

diff --git a/include/deal.II/base/index_set.h b/include/deal.II/base/index_set.h
index 1ed15a0bf7b399cbf3eb8b6480191e5c38adafcd..919c566f93802823176f514b63c772dc250d0d13 100644 (file)
--- a/include/deal.II/base/index_set.h
+++ b/include/deal.II/base/index_set.h
@@ -417,7 +417,7 @@ public:
    * This function is equivalent to calling get_index_vector() and
    * assigning the result to the @p indices argument.
    */
-  DEAL_II_DEPRECATED_EARLY
+  DEAL_II_DEPRECATED
   void
   fill_index_vector(std::vector<size_type> &indices) const;
 

diff --git a/include/deal.II/base/template_constraints.h b/include/deal.II/base/template_constraints.h
index 3991c5e5ea19228c1898a763e3f8e0afdbf8bbf2..d298064240ae73f6563457d8b55e1fb04f0f0672 100644 (file)
--- a/include/deal.II/base/template_constraints.h
+++ b/include/deal.II/base/template_constraints.h
@@ -342,7 +342,7 @@ constexpr bool has_begin_and_end =
  * @deprecated Use `std_cxx20::identity_type` instead.
  */
 template <typename T>
-using identity DEAL_II_DEPRECATED_EARLY = std_cxx20::type_identity<T>;
+using identity DEAL_II_DEPRECATED = std_cxx20::type_identity<T>;
 
 
 /**

diff --git a/include/deal.II/dofs/dof_handler.h b/include/deal.II/dofs/dof_handler.h
index c548898ce58fac6d8b106db0046d25bcba7cd160..b08f751c97862f205fc0616351f8e4c20f73d123 100644 (file)
--- a/include/deal.II/dofs/dof_handler.h
+++ b/include/deal.II/dofs/dof_handler.h
@@ -605,7 +605,7 @@ public:
    *
    * @deprecated Use set_active_fe_indices() with the types::fe_index datatype.
    */
-  DEAL_II_DEPRECATED_EARLY
+  DEAL_II_DEPRECATED
   void
   set_active_fe_indices(const std::vector<unsigned int> &active_fe_indices);
 
@@ -641,7 +641,7 @@ public:
    *
    * @deprecated Use get_active_fe_indices() that returns the result vector.
    */
-  DEAL_II_DEPRECATED_EARLY
+  DEAL_II_DEPRECATED
   void
   get_active_fe_indices(std::vector<unsigned int> &active_fe_indices) const;
 

diff --git a/include/deal.II/dofs/dof_tools.h b/include/deal.II/dofs/dof_tools.h
index a6cbdeb47587965d942a43088e5893fe68cb3250..4b603120d1e1f3d96c19baf65cc328fd9334af49 100644 (file)
--- a/include/deal.II/dofs/dof_tools.h
+++ b/include/deal.II/dofs/dof_tools.h
@@ -2127,7 +2127,7 @@ namespace DoFTools
    * vector.
    */
   template <int dim, int spacedim>
-  DEAL_II_DEPRECATED_EARLY void
+  DEAL_II_DEPRECATED void
   get_active_fe_indices(const DoFHandler<dim, spacedim> &dof_handler,
                         std::vector<unsigned int> &      active_fe_indices);
 
@@ -2304,7 +2304,7 @@ namespace DoFTools
    * @deprecated Use the function that returns the `std::map` instead.
    */
   template <int dim, int spacedim>
-  DEAL_II_DEPRECATED_EARLY void
+  DEAL_II_DEPRECATED void
   map_dofs_to_support_points(
     const Mapping<dim, spacedim> &                      mapping,
     const DoFHandler<dim, spacedim> &                   dof_handler,
@@ -2317,7 +2317,7 @@ namespace DoFTools
    * @deprecated Use the function that returns the `std::map` instead.
    */
   template <int dim, int spacedim>
-  DEAL_II_DEPRECATED_EARLY void
+  DEAL_II_DEPRECATED void
   map_dofs_to_support_points(
     const hp::MappingCollection<dim, spacedim> &        mapping,
     const DoFHandler<dim, spacedim> &                   dof_handler,

diff --git a/include/deal.II/grid/reference_cell.h b/include/deal.II/grid/reference_cell.h
index ad33637f84956709b65c6ba2e996391b039d7836..a07734db3ffc953337ad708e160b1be511ee6b8c 100644 (file)
--- a/include/deal.II/grid/reference_cell.h
+++ b/include/deal.II/grid/reference_cell.h
@@ -640,7 +640,7 @@ public:
    * @deprecated Use get_combined_orientation() instead.
    */
   template <typename T, std::size_t N>
-  DEAL_II_DEPRECATED_EARLY unsigned char
+  DEAL_II_DEPRECATED unsigned char
   compute_orientation(const std::array<T, N> &vertices_0,
                       const std::array<T, N> &vertices_1) const;
 
@@ -689,7 +689,7 @@ public:
    * @deprecated Use permute_by_combined_orientation() instead.
    */
   template <typename T, std::size_t N>
-  DEAL_II_DEPRECATED_EARLY std::array<T, N>
+  DEAL_II_DEPRECATED std::array<T, N>
   permute_according_orientation(const std::array<T, N> &vertices,
                                 const unsigned int      orientation) const;
 

diff --git a/include/deal.II/lac/cuda_vector.h b/include/deal.II/lac/cuda_vector.h
index 13fde01d557957ccb69ff1ca3626725ad90f9f73..1eae5e3bd670bab3876ea4acedd483da504b6fb6 100644 (file)
--- a/include/deal.II/lac/cuda_vector.h
+++ b/include/deal.II/lac/cuda_vector.h
@@ -150,7 +150,7 @@ namespace LinearAlgebra
       /**
        * @deprecated Use import_elements() instead.
        */
-      DEAL_II_DEPRECATED_EARLY virtual void
+      DEAL_II_DEPRECATED virtual void
       import(const ReadWriteVector<Number> &V,
              VectorOperation::values        operation,
              std::shared_ptr<const Utilities::MPI::CommunicationPatternBase>

diff --git a/include/deal.II/lac/la_parallel_block_vector.h b/include/deal.II/lac/la_parallel_block_vector.h
index de93ddcb22228391285f8ba504558f228f209b32..73be633f89d37716b62db835c77ac5312d0cc4ce 100644 (file)
--- a/include/deal.II/lac/la_parallel_block_vector.h
+++ b/include/deal.II/lac/la_parallel_block_vector.h
@@ -581,7 +581,7 @@ namespace LinearAlgebra
       /**
        * @deprecated Use import_elements() instead.
        */
-      DEAL_II_DEPRECATED_EARLY virtual void
+      DEAL_II_DEPRECATED virtual void
       import(const LinearAlgebra::ReadWriteVector<Number> &V,
              VectorOperation::values                       operation,
              std::shared_ptr<const Utilities::MPI::CommunicationPatternBase>

diff --git a/include/deal.II/lac/la_parallel_vector.h b/include/deal.II/lac/la_parallel_vector.h
index c3ab3345f9641bb69570895997b3c4aabab464bb..8777d0ce2822850723a4c6d80bc0a04e11fb92d4 100644 (file)
--- a/include/deal.II/lac/la_parallel_vector.h
+++ b/include/deal.II/lac/la_parallel_vector.h
@@ -711,7 +711,7 @@ namespace LinearAlgebra
        * @deprecated Use import_elements() instead.
        */
       template <typename MemorySpace2>
-      DEAL_II_DEPRECATED_EARLY void
+      DEAL_II_DEPRECATED void
       import(const Vector<Number, MemorySpace2> &src,
              VectorOperation::values             operation)
       {
@@ -778,7 +778,7 @@ namespace LinearAlgebra
       /**
        * @deprecated Use import_elements() instead.
        */
-      DEAL_II_DEPRECATED_EARLY virtual void
+      DEAL_II_DEPRECATED virtual void
       import(const LinearAlgebra::ReadWriteVector<Number> &V,
              VectorOperation::values                       operation,
              std::shared_ptr<const Utilities::MPI::CommunicationPatternBase>

diff --git a/include/deal.II/lac/la_vector.h b/include/deal.II/lac/la_vector.h
index 7384b2afa6c04a29e082f613fde3cbfb60995a1a..78476871f82f096332c67ce9a25d906282ef68b4 100644 (file)
--- a/include/deal.II/lac/la_vector.h
+++ b/include/deal.II/lac/la_vector.h
@@ -231,7 +231,7 @@ namespace LinearAlgebra
     /**
      * @deprecated Use import_elements() instead.
      */
-    DEAL_II_DEPRECATED_EARLY
+    DEAL_II_DEPRECATED
     virtual void
     import(const ReadWriteVector<Number> &V,
            VectorOperation::values        operation,

diff --git a/include/deal.II/lac/petsc_solver.h b/include/deal.II/lac/petsc_solver.h
index 6f6472c1ad2b7f98615ab3cdada859db56d56c92..33d7812362fe0aa6e012391ee3e82a1bf21ef798 100644 (file)
--- a/include/deal.II/lac/petsc_solver.h
+++ b/include/deal.II/lac/petsc_solver.h
@@ -270,7 +270,7 @@ namespace PETScWrappers
      *
      * @deprecated
      */
-    DEAL_II_DEPRECATED_EARLY
+    DEAL_II_DEPRECATED
     SolverRichardson(SolverControl &       cn,
                      const MPI_Comm        mpi_communicator,
                      const AdditionalData &data = AdditionalData());
@@ -322,7 +322,7 @@ namespace PETScWrappers
      *
      * @deprecated
      */
-    DEAL_II_DEPRECATED_EARLY
+    DEAL_II_DEPRECATED
     SolverChebychev(SolverControl &       cn,
                     const MPI_Comm        mpi_communicator,
                     const AdditionalData &data = AdditionalData());
@@ -372,7 +372,7 @@ namespace PETScWrappers
      *
      * @deprecated
      */
-    DEAL_II_DEPRECATED_EARLY
+    DEAL_II_DEPRECATED
     SolverCG(SolverControl &       cn,
              const MPI_Comm        mpi_communicator,
              const AdditionalData &data = AdditionalData());
@@ -423,7 +423,7 @@ namespace PETScWrappers
      *
      * @deprecated
      */
-    DEAL_II_DEPRECATED_EARLY
+    DEAL_II_DEPRECATED
     SolverBiCG(SolverControl &       cn,
                const MPI_Comm        mpi_communicator,
                const AdditionalData &data = AdditionalData());
@@ -491,7 +491,7 @@ namespace PETScWrappers
      *
      * @deprecated
      */
-    DEAL_II_DEPRECATED_EARLY
+    DEAL_II_DEPRECATED
     SolverGMRES(SolverControl &       cn,
                 const MPI_Comm        mpi_communicator,
                 const AdditionalData &data = AdditionalData());
@@ -543,7 +543,7 @@ namespace PETScWrappers
      *
      * @deprecated
      */
-    DEAL_II_DEPRECATED_EARLY
+    DEAL_II_DEPRECATED
     SolverBicgstab(SolverControl &       cn,
                    const MPI_Comm        mpi_communicator,
                    const AdditionalData &data = AdditionalData());
@@ -594,7 +594,7 @@ namespace PETScWrappers
      *
      * @deprecated
      */
-    DEAL_II_DEPRECATED_EARLY
+    DEAL_II_DEPRECATED
     SolverCGS(SolverControl &       cn,
               const MPI_Comm        mpi_communicator,
               const AdditionalData &data = AdditionalData());
@@ -645,7 +645,7 @@ namespace PETScWrappers
      *
      * @deprecated
      */
-    DEAL_II_DEPRECATED_EARLY
+    DEAL_II_DEPRECATED
     SolverTFQMR(SolverControl &       cn,
                 const MPI_Comm        mpi_communicator,
                 const AdditionalData &data = AdditionalData());
@@ -701,7 +701,7 @@ namespace PETScWrappers
      *
      * @deprecated
      */
-    DEAL_II_DEPRECATED_EARLY
+    DEAL_II_DEPRECATED
     SolverTCQMR(SolverControl &       cn,
                 const MPI_Comm        mpi_communicator,
                 const AdditionalData &data = AdditionalData());
@@ -751,7 +751,7 @@ namespace PETScWrappers
      *
      * @deprecated
      */
-    DEAL_II_DEPRECATED_EARLY
+    DEAL_II_DEPRECATED
     SolverCR(SolverControl &       cn,
              const MPI_Comm        mpi_communicator,
              const AdditionalData &data = AdditionalData());
@@ -803,7 +803,7 @@ namespace PETScWrappers
      *
      * @deprecated
      */
-    DEAL_II_DEPRECATED_EARLY
+    DEAL_II_DEPRECATED
     SolverLSQR(SolverControl &       cn,
                const MPI_Comm        mpi_communicator,
                const AdditionalData &data = AdditionalData());
@@ -859,7 +859,7 @@ namespace PETScWrappers
      *
      * @deprecated
      */
-    DEAL_II_DEPRECATED_EARLY
+    DEAL_II_DEPRECATED
     SolverPreOnly(SolverControl &       cn,
                   const MPI_Comm        mpi_communicator,
                   const AdditionalData &data = AdditionalData());
@@ -922,7 +922,7 @@ namespace PETScWrappers
      *
      * @deprecated
      */
-    DEAL_II_DEPRECATED_EARLY
+    DEAL_II_DEPRECATED
     SparseDirectMUMPS(SolverControl &       cn,
                       const MPI_Comm        mpi_communicator,
                       const AdditionalData &data = AdditionalData());

diff --git a/include/deal.II/lac/read_write_vector.h b/include/deal.II/lac/read_write_vector.h
index b6ce1f193b63236aab7eaa0b8721b1f18f2c54b0..a062cf7aeaf45c671cfc954a3a991a0d80b209ab 100644 (file)
--- a/include/deal.II/lac/read_write_vector.h
+++ b/include/deal.II/lac/read_write_vector.h
@@ -307,7 +307,7 @@ namespace LinearAlgebra
     /**
      * @deprecated Use import_elements() instead.
      */
-    DEAL_II_DEPRECATED_EARLY
+    DEAL_II_DEPRECATED
     void
     import(const dealii::Vector<Number> &V,
            VectorOperation::values       operation,
@@ -336,7 +336,7 @@ namespace LinearAlgebra
     /**
      * @deprecated Use import_elements() instead.
      */
-    DEAL_II_DEPRECATED_EARLY
+    DEAL_II_DEPRECATED
     void
     import(const LinearAlgebra::Vector<Number> &V,
            VectorOperation::values              operation,
@@ -366,7 +366,7 @@ namespace LinearAlgebra
      * @deprecated Use import_elements() instead.
      */
     template <typename MemorySpace>
-    DEAL_II_DEPRECATED_EARLY void
+    DEAL_II_DEPRECATED void
     import(const distributed::Vector<Number, MemorySpace> &V,
            VectorOperation::values                         operation,
            const std::shared_ptr<const Utilities::MPI::CommunicationPatternBase>
@@ -395,7 +395,7 @@ namespace LinearAlgebra
     /**
      * @deprecated Use import_elements() instead.
      */
-    DEAL_II_DEPRECATED_EARLY
+    DEAL_II_DEPRECATED
     void
     import(const PETScWrappers::MPI::Vector &V,
            VectorOperation::values           operation,
@@ -427,7 +427,7 @@ namespace LinearAlgebra
     /**
      * @deprecated Use import_elements() instead.
      */
-    DEAL_II_DEPRECATED_EARLY
+    DEAL_II_DEPRECATED
     void
     import(const TrilinosWrappers::MPI::Vector &V,
            VectorOperation::values              operation,
@@ -459,7 +459,7 @@ namespace LinearAlgebra
      * @deprecated Use import_elements() instead.
      */
     template <typename Dummy = Number>
-    DEAL_II_DEPRECATED_EARLY
+    DEAL_II_DEPRECATED
       std::enable_if_t<std::is_same<Dummy, Number>::value &&
                        dealii::is_tpetra_type<Number>::value>
       import(
@@ -490,7 +490,7 @@ namespace LinearAlgebra
     /**
      * @deprecated Use import_elements() instead.
      */
-    DEAL_II_DEPRECATED_EARLY
+    DEAL_II_DEPRECATED
     void
     import(const EpetraWrappers::Vector &V,
            VectorOperation::values       operation,
@@ -519,7 +519,7 @@ namespace LinearAlgebra
     /**
      * @deprecated Use import_elements() instead.
      */
-    DEAL_II_DEPRECATED_EARLY
+    DEAL_II_DEPRECATED
     void
     import(const CUDAWrappers::Vector<Number> &V,
            VectorOperation::values             operation,

diff --git a/include/deal.II/lac/trilinos_epetra_vector.h b/include/deal.II/lac/trilinos_epetra_vector.h
index a519523235c7021da6b0b72e507f3172f30e4fd6..dba315e093fbf0849bec6270cd51f2cd7b62e4df 100644 (file)
--- a/include/deal.II/lac/trilinos_epetra_vector.h
+++ b/include/deal.II/lac/trilinos_epetra_vector.h
@@ -136,7 +136,7 @@ namespace LinearAlgebra
       /**
        * @deprecated Use import_elements() instead.
        */
-      DEAL_II_DEPRECATED_EARLY
+      DEAL_II_DEPRECATED
       virtual void
       import(const ReadWriteVector<double> &V,
              VectorOperation::values        operation,

diff --git a/include/deal.II/lac/trilinos_tpetra_vector.h b/include/deal.II/lac/trilinos_tpetra_vector.h
index 807099a433eb6abdd91b55590e416d60aff6469c..00db7ae697dea330ef048a64f19fbca1cbbb836f 100644 (file)
--- a/include/deal.II/lac/trilinos_tpetra_vector.h
+++ b/include/deal.II/lac/trilinos_tpetra_vector.h
@@ -192,7 +192,7 @@ namespace LinearAlgebra
       /**
        * @deprecated Use import_elements() instead.
        */
-      DEAL_II_DEPRECATED_EARLY
+      DEAL_II_DEPRECATED
       virtual void
       import(const ReadWriteVector<Number> &V,
              VectorOperation::values        operation,

diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h
index 35657be9df6e47da3cf8b2eb0e7208ce7126f049..1d77616a1eaf2db00f752b670a39d630dbf026d7 100644 (file)
--- a/include/deal.II/lac/trilinos_vector.h
+++ b/include/deal.II/lac/trilinos_vector.h
@@ -731,7 +731,7 @@ namespace TrilinosWrappers
       /**
        * @deprecated Use import_elements() instead.
        */
-      DEAL_II_DEPRECATED_EARLY
+      DEAL_II_DEPRECATED
       void
       import(const LinearAlgebra::ReadWriteVector<double> &rwv,
              const VectorOperation::values                 operation)

diff --git a/include/deal.II/lac/vector_space_vector.h b/include/deal.II/lac/vector_space_vector.h
index df6ed828830765eb8326f8540d3f3dc785a84205..92b65985d5609249586ca74ce2441d65b6b02553 100644 (file)
--- a/include/deal.II/lac/vector_space_vector.h
+++ b/include/deal.II/lac/vector_space_vector.h
@@ -117,7 +117,7 @@ namespace LinearAlgebra
     /**
      * @deprecated Use import_elements() instead.
      */
-    DEAL_II_DEPRECATED_EARLY
+    DEAL_II_DEPRECATED
     virtual void
     import(const ReadWriteVector<Number> &V,
            VectorOperation::values        operation,

diff --git a/source/dofs/dof_tools.cc b/source/dofs/dof_tools.cc
index 6417a7acf33f711524781f20f3a2077043339f7f..d91d71625717c491cacc4cbff35d2e5fef4b87f9 100644 (file)
--- a/source/dofs/dof_tools.cc
+++ b/source/dofs/dof_tools.cc
@@ -2295,7 +2295,7 @@ namespace DoFTools
 
   // This function is deprecated:
   template <int dim, int spacedim>
-  DEAL_II_DEPRECATED_EARLY void
+  DEAL_II_DEPRECATED void
   map_dofs_to_support_points(
     const Mapping<dim, spacedim> &                      mapping,
     const DoFHandler<dim, spacedim> &                   dof_handler,
@@ -2316,7 +2316,7 @@ namespace DoFTools
 
   // This function is deprecated:
   template <int dim, int spacedim>
-  DEAL_II_DEPRECATED_EARLY void
+  DEAL_II_DEPRECATED void
   map_dofs_to_support_points(
     const hp::MappingCollection<dim, spacedim> &        mapping,
     const DoFHandler<dim, spacedim> &                   dof_handler,