From: Matthias Maier Date: Tue, 27 Jun 2023 17:07:34 +0000 (-0500) Subject: switch DEAL_II_DEPRECATED_EARLY over to DEAL_II_DEPRECATED X-Git-Tag: relicensing~861^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9c8d9204aa354995d1e8926ad9548f6a137ac4f;p=dealii.git 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 1ed15a0bf7..919c566f93 100644 --- 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 &indices) const; diff --git a/include/deal.II/base/template_constraints.h b/include/deal.II/base/template_constraints.h index 3991c5e5ea..d298064240 100644 --- 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 -using identity DEAL_II_DEPRECATED_EARLY = std_cxx20::type_identity; +using identity DEAL_II_DEPRECATED = std_cxx20::type_identity; /** diff --git a/include/deal.II/dofs/dof_handler.h b/include/deal.II/dofs/dof_handler.h index c548898ce5..b08f751c97 100644 --- 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 &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 &active_fe_indices) const; diff --git a/include/deal.II/dofs/dof_tools.h b/include/deal.II/dofs/dof_tools.h index a6cbdeb475..4b603120d1 100644 --- a/include/deal.II/dofs/dof_tools.h +++ b/include/deal.II/dofs/dof_tools.h @@ -2127,7 +2127,7 @@ namespace DoFTools * vector. */ template - DEAL_II_DEPRECATED_EARLY void + DEAL_II_DEPRECATED void get_active_fe_indices(const DoFHandler &dof_handler, std::vector & active_fe_indices); @@ -2304,7 +2304,7 @@ namespace DoFTools * @deprecated Use the function that returns the `std::map` instead. */ template - DEAL_II_DEPRECATED_EARLY void + DEAL_II_DEPRECATED void map_dofs_to_support_points( const Mapping & mapping, const DoFHandler & dof_handler, @@ -2317,7 +2317,7 @@ namespace DoFTools * @deprecated Use the function that returns the `std::map` instead. */ template - DEAL_II_DEPRECATED_EARLY void + DEAL_II_DEPRECATED void map_dofs_to_support_points( const hp::MappingCollection & mapping, const DoFHandler & dof_handler, diff --git a/include/deal.II/grid/reference_cell.h b/include/deal.II/grid/reference_cell.h index ad33637f84..a07734db3f 100644 --- 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 - DEAL_II_DEPRECATED_EARLY unsigned char + DEAL_II_DEPRECATED unsigned char compute_orientation(const std::array &vertices_0, const std::array &vertices_1) const; @@ -689,7 +689,7 @@ public: * @deprecated Use permute_by_combined_orientation() instead. */ template - DEAL_II_DEPRECATED_EARLY std::array + DEAL_II_DEPRECATED std::array permute_according_orientation(const std::array &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 13fde01d55..1eae5e3bd6 100644 --- 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 &V, VectorOperation::values operation, std::shared_ptr diff --git a/include/deal.II/lac/la_parallel_block_vector.h b/include/deal.II/lac/la_parallel_block_vector.h index de93ddcb22..73be633f89 100644 --- 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 &V, VectorOperation::values operation, std::shared_ptr diff --git a/include/deal.II/lac/la_parallel_vector.h b/include/deal.II/lac/la_parallel_vector.h index c3ab3345f9..8777d0ce28 100644 --- 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 - DEAL_II_DEPRECATED_EARLY void + DEAL_II_DEPRECATED void import(const Vector &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 &V, VectorOperation::values operation, std::shared_ptr diff --git a/include/deal.II/lac/la_vector.h b/include/deal.II/lac/la_vector.h index 7384b2afa6..78476871f8 100644 --- 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 &V, VectorOperation::values operation, diff --git a/include/deal.II/lac/petsc_solver.h b/include/deal.II/lac/petsc_solver.h index 6f6472c1ad..33d7812362 100644 --- 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 b6ce1f193b..a062cf7aea 100644 --- 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 &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 &V, VectorOperation::values operation, @@ -366,7 +366,7 @@ namespace LinearAlgebra * @deprecated Use import_elements() instead. */ template - DEAL_II_DEPRECATED_EARLY void + DEAL_II_DEPRECATED void import(const distributed::Vector &V, VectorOperation::values operation, const std::shared_ptr @@ -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 - DEAL_II_DEPRECATED_EARLY + DEAL_II_DEPRECATED std::enable_if_t::value && dealii::is_tpetra_type::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 &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 a519523235..dba315e093 100644 --- 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 &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 807099a433..00db7ae697 100644 --- 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 &V, VectorOperation::values operation, diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h index 35657be9df..1d77616a1e 100644 --- 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 &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 df6ed82883..92b65985d5 100644 --- 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 &V, VectorOperation::values operation, diff --git a/source/dofs/dof_tools.cc b/source/dofs/dof_tools.cc index 6417a7acf3..d91d716257 100644 --- a/source/dofs/dof_tools.cc +++ b/source/dofs/dof_tools.cc @@ -2295,7 +2295,7 @@ namespace DoFTools // This function is deprecated: template - DEAL_II_DEPRECATED_EARLY void + DEAL_II_DEPRECATED void map_dofs_to_support_points( const Mapping & mapping, const DoFHandler & dof_handler, @@ -2316,7 +2316,7 @@ namespace DoFTools // This function is deprecated: template - DEAL_II_DEPRECATED_EARLY void + DEAL_II_DEPRECATED void map_dofs_to_support_points( const hp::MappingCollection & mapping, const DoFHandler & dof_handler,