From 4465fef8a7baf1598aadcfe4b5b59905e5894a41 Mon Sep 17 00:00:00 2001 From: David Wells Date: Sat, 18 Jan 2025 14:20:34 -0500 Subject: [PATCH] Consistently format deprecated headers. --- .../base/mpi_consensus_algorithms.templates.h | 5 +++-- include/deal.II/base/sacado_product_type.h | 7 ++++--- include/deal.II/base/std_cxx17/algorithm.h | 13 +++++++------ include/deal.II/base/std_cxx17/optional.h | 13 +++++++------ include/deal.II/base/std_cxx17/tuple.h | 11 ++++++----- include/deal.II/base/std_cxx17/variant.h | 11 ++++++----- include/deal.II/base/vector_slice.h | 4 ++-- include/deal.II/dofs/dof_accessor.templates.h | 8 ++++++-- include/deal.II/fe/fe_base.h | 5 ++++- include/deal.II/grid/tria_accessor.templates.h | 8 ++++++-- include/deal.II/grid/tria_iterator.templates.h | 7 ++++--- include/deal.II/lac/constraint_matrix.h | 7 +++---- .../lac/petsc_parallel_block_sparse_matrix.h | 7 +++---- include/deal.II/lac/petsc_parallel_block_vector.h | 5 ++--- include/deal.II/lac/petsc_parallel_sparse_matrix.h | 4 ++-- include/deal.II/lac/petsc_parallel_vector.h | 4 ++-- include/deal.II/opencascade/boundary_lib.h | 7 +++---- 17 files changed, 70 insertions(+), 56 deletions(-) diff --git a/include/deal.II/base/mpi_consensus_algorithms.templates.h b/include/deal.II/base/mpi_consensus_algorithms.templates.h index 187b315aa5..565b52ae37 100644 --- a/include/deal.II/base/mpi_consensus_algorithms.templates.h +++ b/include/deal.II/base/mpi_consensus_algorithms.templates.h @@ -17,8 +17,9 @@ #include -DEAL_II_WARNING( - "This file is deprecated. Simply use .") +#include +DEAL_II_WARNING("This file is deprecated." + "Use deal.II/base/mpi_consensus_algorithms.h instead.") #endif diff --git a/include/deal.II/base/sacado_product_type.h b/include/deal.II/base/sacado_product_type.h index 2ae15a7647..bf58df7662 100644 --- a/include/deal.II/base/sacado_product_type.h +++ b/include/deal.II/base/sacado_product_type.h @@ -12,14 +12,15 @@ // // ------------------------------------------------------------------------ - #ifndef dealii_sacado_product_type_h_deprecated #define dealii_sacado_product_type_h_deprecated #include -DEAL_II_WARNING(`"This file is deprecated. Use instead.") - #include +DEAL_II_WARNING( + "This file is deprecated." + "Use deal.II/differentiation/ad/sacado_product_types.h instead.") + #endif diff --git a/include/deal.II/base/std_cxx17/algorithm.h b/include/deal.II/base/std_cxx17/algorithm.h index 5579f26e4d..3ce4ed8bd0 100644 --- a/include/deal.II/base/std_cxx17/algorithm.h +++ b/include/deal.II/base/std_cxx17/algorithm.h @@ -11,23 +11,24 @@ // LICENSE.md and CONTRIBUTING.md at the top level directory of deal.II. // // ------------------------------------------------------------------------ + #ifndef dealii_cxx17_algorithm_h #define dealii_cxx17_algorithm_h #include +#include + #ifdef DEAL_II_EARLY_DEPRECATIONS -DEAL_II_WARNING( - "This file is deprecated. Simply use the corresponding C++17 header .") +DEAL_II_WARNING("This file is deprecated." + "Use the corresponding C++17 header algorithm instead.") #endif -#include - DEAL_II_NAMESPACE_OPEN namespace std_cxx17 { using std::clamp; -} // namespace std_cxx17 +} DEAL_II_NAMESPACE_CLOSE -#endif // dealii_cxx17_algorithm_h +#endif diff --git a/include/deal.II/base/std_cxx17/optional.h b/include/deal.II/base/std_cxx17/optional.h index c6a24dbada..bf247bc2bb 100644 --- a/include/deal.II/base/std_cxx17/optional.h +++ b/include/deal.II/base/std_cxx17/optional.h @@ -11,23 +11,24 @@ // LICENSE.md and CONTRIBUTING.md at the top level directory of deal.II. // // ------------------------------------------------------------------------ + #ifndef dealii_cxx17_optional_h #define dealii_cxx17_optional_h #include +#include + #ifdef DEAL_II_EARLY_DEPRECATIONS -DEAL_II_WARNING( - "This file is deprecated. Simply use the corresponding C++17 header .") +DEAL_II_WARNING("This file is deprecated." + "Use the corresponding C++17 header optional instead.") #endif -#include - DEAL_II_NAMESPACE_OPEN namespace std_cxx17 { using std::optional; -} // namespace std_cxx17 +} DEAL_II_NAMESPACE_CLOSE -#endif // dealii_cxx17_optional_h +#endif diff --git a/include/deal.II/base/std_cxx17/tuple.h b/include/deal.II/base/std_cxx17/tuple.h index 4286644720..dd9bc4478f 100644 --- a/include/deal.II/base/std_cxx17/tuple.h +++ b/include/deal.II/base/std_cxx17/tuple.h @@ -11,23 +11,24 @@ // LICENSE.md and CONTRIBUTING.md at the top level directory of deal.II. // // ------------------------------------------------------------------------ + #ifndef dealii_cxx17_tuple_h #define dealii_cxx17_tuple_h #include +#include + #ifdef DEAL_II_EARLY_DEPRECATIONS -DEAL_II_WARNING( - "This file is deprecated. Simply use the corresponding C++17 header .") +DEAL_II_WARNING("This file is deprecated." + "Use the corresponding C++17 header tuple instead.") #endif -#include - DEAL_II_NAMESPACE_OPEN namespace std_cxx17 { using std::apply; -} // namespace std_cxx17 +} DEAL_II_NAMESPACE_CLOSE #endif diff --git a/include/deal.II/base/std_cxx17/variant.h b/include/deal.II/base/std_cxx17/variant.h index 226306f1a7..aff8aa1f8e 100644 --- a/include/deal.II/base/std_cxx17/variant.h +++ b/include/deal.II/base/std_cxx17/variant.h @@ -11,18 +11,19 @@ // LICENSE.md and CONTRIBUTING.md at the top level directory of deal.II. // // ------------------------------------------------------------------------ + #ifndef dealii_cxx17_variant_h #define dealii_cxx17_variant_h #include +#include + #ifdef DEAL_II_EARLY_DEPRECATIONS -DEAL_II_WARNING( - "This file is deprecated. Simply use the corresponding C++17 header .") +DEAL_II_WARNING("This file is deprecated." + "Use the corresponding C++17 header variant instead.") #endif -#include - DEAL_II_NAMESPACE_OPEN namespace std_cxx17 { @@ -32,4 +33,4 @@ namespace std_cxx17 } // namespace std_cxx17 DEAL_II_NAMESPACE_CLOSE -#endif // dealii_cxx17_variant_h +#endif diff --git a/include/deal.II/base/vector_slice.h b/include/deal.II/base/vector_slice.h index 4d77c84c4d..1b37d3b6d4 100644 --- a/include/deal.II/base/vector_slice.h +++ b/include/deal.II/base/vector_slice.h @@ -17,7 +17,7 @@ #include -DEAL_II_WARNING( - "This file is deprecated. Use ArrayView instead of VectorSlice.") +DEAL_II_WARNING("This file is deprecated." + "Use ArrayView instead of VectorSlice.") #endif diff --git a/include/deal.II/dofs/dof_accessor.templates.h b/include/deal.II/dofs/dof_accessor.templates.h index c544aa5f3d..f53f33bdad 100644 --- a/include/deal.II/dofs/dof_accessor.templates.h +++ b/include/deal.II/dofs/dof_accessor.templates.h @@ -15,7 +15,11 @@ #ifndef dealii_dof_accessor_templates_h #define dealii_dof_accessor_templates_h -DEAL_II_WARNING( - "The use of this header file is deprecated. Just include .") +#include + +#include + +DEAL_II_WARNING("This file is deprecated." + "Use deal.II/dofs/dof_accessor.h instead.") #endif diff --git a/include/deal.II/fe/fe_base.h b/include/deal.II/fe/fe_base.h index d44d200b0e..99a5cbcaa9 100644 --- a/include/deal.II/fe/fe_base.h +++ b/include/deal.II/fe/fe_base.h @@ -17,6 +17,9 @@ #include -DEAL_II_WARNING("This file is deprecated. Simply use .") +#include + +DEAL_II_WARNING("This file is deprecated." + "Use deal.II/fe/fe_data.h instead.") #endif diff --git a/include/deal.II/grid/tria_accessor.templates.h b/include/deal.II/grid/tria_accessor.templates.h index 6ab9563bd4..df7aa5965b 100644 --- a/include/deal.II/grid/tria_accessor.templates.h +++ b/include/deal.II/grid/tria_accessor.templates.h @@ -15,7 +15,11 @@ #ifndef dealii_tria_accessor_templates_h #define dealii_tria_accessor_templates_h -#warning \ - "The use of this header file is deprecated. Just include ." +#include + +#include + +DEAL_II_WARNING("This file is deprecated." + "Use deal.II/grid/tria_accessor.h instead.") #endif diff --git a/include/deal.II/grid/tria_iterator.templates.h b/include/deal.II/grid/tria_iterator.templates.h index 6b6becbcd5..20c5a6ce0c 100644 --- a/include/deal.II/grid/tria_iterator.templates.h +++ b/include/deal.II/grid/tria_iterator.templates.h @@ -15,10 +15,11 @@ #ifndef dealii_tria_iterator_templates_h #define dealii_tria_iterator_templates_h - #include -DEAL_II_WARNING( - "The use of this header file is deprecated. Just include .") +#include + +DEAL_II_WARNING("This file is deprecated." + "Use deal.II/grid/tria_iterator.h instead.") #endif diff --git a/include/deal.II/lac/constraint_matrix.h b/include/deal.II/lac/constraint_matrix.h index 3814592da5..683c62ae64 100644 --- a/include/deal.II/lac/constraint_matrix.h +++ b/include/deal.II/lac/constraint_matrix.h @@ -12,15 +12,14 @@ // // ------------------------------------------------------------------------ - #ifndef dealii_constraint_matrix_h #define dealii_constraint_matrix_h #include -DEAL_II_WARNING( - "This file is deprecated. Use instead.") - #include +DEAL_II_WARNING("This file is deprecated." + "Use deal.II/lac/affine_constraints.h instead.") + #endif diff --git a/include/deal.II/lac/petsc_parallel_block_sparse_matrix.h b/include/deal.II/lac/petsc_parallel_block_sparse_matrix.h index 386f0725cb..3721ba4344 100644 --- a/include/deal.II/lac/petsc_parallel_block_sparse_matrix.h +++ b/include/deal.II/lac/petsc_parallel_block_sparse_matrix.h @@ -15,12 +15,11 @@ #ifndef dealii_petsc_parallel_block_sparse_matrix_h #define dealii_petsc_parallel_block_sparse_matrix_h - #include #include -DEAL_II_WARNING( - "This file is deprecated. Use deal.II/lac/petsc_block_sparse_matrix.h instead!") +DEAL_II_WARNING("This file is deprecated." + "Use deal.II/lac/petsc_block_sparse_matrix.h instead.") -#endif // dealii_petsc_parallel_block_sparse_matrix_h +#endif diff --git a/include/deal.II/lac/petsc_parallel_block_vector.h b/include/deal.II/lac/petsc_parallel_block_vector.h index 551d017a80..6e6d8c66ec 100644 --- a/include/deal.II/lac/petsc_parallel_block_vector.h +++ b/include/deal.II/lac/petsc_parallel_block_vector.h @@ -15,12 +15,11 @@ #ifndef dealii_petsc_parallel_block_vector_h #define dealii_petsc_parallel_block_vector_h - #include #include -DEAL_II_WARNING( - "This file is deprecated. Use deal.II/lac/petsc_block_vector.h instead!") +DEAL_II_WARNING("This file is deprecated." + "Use deal.II/lac/petsc_block_vector.h instead.") #endif diff --git a/include/deal.II/lac/petsc_parallel_sparse_matrix.h b/include/deal.II/lac/petsc_parallel_sparse_matrix.h index d9715ca5b4..b6b0c13557 100644 --- a/include/deal.II/lac/petsc_parallel_sparse_matrix.h +++ b/include/deal.II/lac/petsc_parallel_sparse_matrix.h @@ -19,7 +19,7 @@ #include -DEAL_II_WARNING( - "This file is deprecated. Use deal.II/lac/petsc_sparse_matrix.h instead.") +DEAL_II_WARNING("This file is deprecated." + "Use deal.II/lac/petsc_sparse_matrix.h instead.") #endif diff --git a/include/deal.II/lac/petsc_parallel_vector.h b/include/deal.II/lac/petsc_parallel_vector.h index d58f19ce7c..501b831dcf 100644 --- a/include/deal.II/lac/petsc_parallel_vector.h +++ b/include/deal.II/lac/petsc_parallel_vector.h @@ -19,7 +19,7 @@ #include -DEAL_II_WARNING( - "This file is deprecated. Use deal.II/lac/petsc_vector.h instead!") +DEAL_II_WARNING("This file is deprecated." + "Use deal.II/lac/petsc_vector.h instead.") #endif diff --git a/include/deal.II/opencascade/boundary_lib.h b/include/deal.II/opencascade/boundary_lib.h index 300c144dcf..667aff2ec8 100644 --- a/include/deal.II/opencascade/boundary_lib.h +++ b/include/deal.II/opencascade/boundary_lib.h @@ -12,7 +12,6 @@ // // ------------------------------------------------------------------------ - #ifndef dealii_occ_boundary_lib_h #define dealii_occ_boundary_lib_h @@ -20,7 +19,7 @@ #include -DEAL_II_WARNING( - "This file is deprecated. Use deal.II/opencascade/manifold_lib.h and the classes therein instead.") +DEAL_II_WARNING("This file is deprecated." + "Use deal.II/opencascade/manifold_lib.h instead.") -#endif // dealii_occ_boundary_lib_h +#endif -- 2.39.5