From: Timo Heister Date: Tue, 8 Jul 2025 21:17:36 +0000 (-0400) Subject: hide trilinos 16 deprecation warnings X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e63c27069a4da553225f86c8d1ecf86d3f9fc1c;p=dealii.git hide trilinos 16 deprecation warnings Trilinos 16 deprecates various packages (epetra, ML, AztecOO) and including any of the headers prints a warning. Let's hide it for now. --- diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in index 79f3cc8b2e..6ace58067e 100644 --- a/include/deal.II/base/config.h.in +++ b/include/deal.II/base/config.h.in @@ -604,6 +604,7 @@ _Pragma("GCC diagnostic ignored \"-Wunknown-warning\"") /*!*/ \ _Pragma("GCC diagnostic ignored \"-Wextra\"") /*!*/ \ _Pragma("GCC diagnostic ignored \"-Waddress-of-packed-member\"") \ _Pragma("GCC diagnostic ignored \"-Wcast-function-type\"") \ +_Pragma("GCC diagnostic ignored \"-Wcpp\"") \ _Pragma("GCC diagnostic ignored \"-Wdeprecated-copy\"") \ _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") \ _Pragma("GCC diagnostic ignored \"-Wdeprecated-volatile\"") \ diff --git a/include/deal.II/base/index_set.h b/include/deal.II/base/index_set.h index 83c07a9d83..8d814f3ed8 100644 --- a/include/deal.II/base/index_set.h +++ b/include/deal.II/base/index_set.h @@ -33,10 +33,14 @@ #ifdef DEAL_II_WITH_TRILINOS + +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # ifdef DEAL_II_TRILINOS_WITH_TPETRA # include # endif +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS + #endif #ifdef DEAL_II_WITH_PETSC diff --git a/include/deal.II/base/trilinos_utilities.h b/include/deal.II/base/trilinos_utilities.h index 4330ee6b01..fa52516a52 100644 --- a/include/deal.II/base/trilinos_utilities.h +++ b/include/deal.II/base/trilinos_utilities.h @@ -20,6 +20,8 @@ #include #ifdef DEAL_II_WITH_TRILINOS + +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include @@ -34,6 +36,7 @@ # ifdef DEAL_II_TRILINOS_WITH_TPETRA # include # endif // DEAL_II_TRILINOS_WITH_TPETRA +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #endif diff --git a/include/deal.II/lac/read_write_vector.h b/include/deal.II/lac/read_write_vector.h index 16e74943b9..b9dce08d89 100644 --- a/include/deal.II/lac/read_write_vector.h +++ b/include/deal.II/lac/read_write_vector.h @@ -39,7 +39,9 @@ # include # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #endif diff --git a/include/deal.II/lac/read_write_vector.templates.h b/include/deal.II/lac/read_write_vector.templates.h index beab1a7a79..f604abaf24 100644 --- a/include/deal.II/lac/read_write_vector.templates.h +++ b/include/deal.II/lac/read_write_vector.templates.h @@ -34,7 +34,9 @@ # include # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #endif #include diff --git a/include/deal.II/lac/trilinos_epetra_communication_pattern.h b/include/deal.II/lac/trilinos_epetra_communication_pattern.h index e2549d4ed6..c45a47baec 100644 --- a/include/deal.II/lac/trilinos_epetra_communication_pattern.h +++ b/include/deal.II/lac/trilinos_epetra_communication_pattern.h @@ -22,7 +22,9 @@ # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # include diff --git a/include/deal.II/lac/trilinos_epetra_vector.h b/include/deal.II/lac/trilinos_epetra_vector.h index 56d79202b0..7538280adc 100644 --- a/include/deal.II/lac/trilinos_epetra_vector.h +++ b/include/deal.II/lac/trilinos_epetra_vector.h @@ -28,7 +28,9 @@ # include # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # include diff --git a/include/deal.II/lac/trilinos_index_access.h b/include/deal.II/lac/trilinos_index_access.h index 1f6015439c..20c9b8c6f4 100644 --- a/include/deal.II/lac/trilinos_index_access.h +++ b/include/deal.II/lac/trilinos_index_access.h @@ -21,10 +21,13 @@ # include + +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS DEAL_II_NAMESPACE_OPEN diff --git a/include/deal.II/lac/trilinos_precondition.h b/include/deal.II/lac/trilinos_precondition.h index 07a1faed34..47c28e50d8 100644 --- a/include/deal.II/lac/trilinos_precondition.h +++ b/include/deal.II/lac/trilinos_precondition.h @@ -25,12 +25,14 @@ # include # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include # include # include # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # include diff --git a/include/deal.II/lac/trilinos_solver.h b/include/deal.II/lac/trilinos_solver.h index cc2d794b50..ad1edc1e54 100644 --- a/include/deal.II/lac/trilinos_solver.h +++ b/include/deal.II/lac/trilinos_solver.h @@ -27,6 +27,8 @@ # include # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS + // for AztecOO solvers # include # include @@ -44,6 +46,9 @@ # include # endif +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS + + # include diff --git a/include/deal.II/lac/trilinos_sparse_matrix.h b/include/deal.II/lac/trilinos_sparse_matrix.h index a068c709f8..50be96adce 100644 --- a/include/deal.II/lac/trilinos_sparse_matrix.h +++ b/include/deal.II/lac/trilinos_sparse_matrix.h @@ -33,6 +33,7 @@ # include # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include @@ -41,6 +42,7 @@ # include # include # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # include # include diff --git a/include/deal.II/lac/trilinos_sparsity_pattern.h b/include/deal.II/lac/trilinos_sparsity_pattern.h index 648dd8a274..9120a092d2 100644 --- a/include/deal.II/lac/trilinos_sparsity_pattern.h +++ b/include/deal.II/lac/trilinos_sparsity_pattern.h @@ -27,9 +27,11 @@ # include # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # include # include diff --git a/include/deal.II/lac/trilinos_vector.h b/include/deal.II/lac/trilinos_vector.h index 69fb3bd655..d26c0bb45d 100644 --- a/include/deal.II/lac/trilinos_vector.h +++ b/include/deal.II/lac/trilinos_vector.h @@ -29,11 +29,13 @@ # include # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include # include # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # include # include diff --git a/source/base/index_set.cc b/source/base/index_set.cc index ebe95647de..ec0c536b39 100644 --- a/source/base/index_set.cc +++ b/source/base/index_set.cc @@ -24,6 +24,7 @@ #include #ifdef DEAL_II_WITH_TRILINOS +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # ifdef DEAL_II_WITH_MPI # include # endif @@ -32,6 +33,7 @@ # ifdef DEAL_II_TRILINOS_WITH_TPETRA # include # endif +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #endif DEAL_II_NAMESPACE_OPEN diff --git a/source/base/init_finalize.cc b/source/base/init_finalize.cc index d9bde45743..081fdaaf6d 100644 --- a/source/base/init_finalize.cc +++ b/source/base/init_finalize.cc @@ -28,7 +28,9 @@ # include # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # endif #endif diff --git a/source/base/trilinos_utilities.cc b/source/base/trilinos_utilities.cc index 2cec4843fb..a64a0536e5 100644 --- a/source/base/trilinos_utilities.cc +++ b/source/base/trilinos_utilities.cc @@ -16,12 +16,14 @@ #include #ifdef DEAL_II_WITH_TRILINOS +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # ifdef DEAL_II_WITH_MPI # include # include # endif # include # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #endif DEAL_II_NAMESPACE_OPEN diff --git a/source/lac/trilinos_epetra_communication_pattern.cc b/source/lac/trilinos_epetra_communication_pattern.cc index 71a9278085..5d1afa2409 100644 --- a/source/lac/trilinos_epetra_communication_pattern.cc +++ b/source/lac/trilinos_epetra_communication_pattern.cc @@ -18,7 +18,9 @@ # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # include diff --git a/source/lac/trilinos_precondition.cc b/source/lac/trilinos_precondition.cc index a62048736c..f40156fa45 100644 --- a/source/lac/trilinos_precondition.cc +++ b/source/lac/trilinos_precondition.cc @@ -20,11 +20,13 @@ # include # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include # include # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS DEAL_II_NAMESPACE_OPEN diff --git a/source/lac/trilinos_precondition_ml.cc b/source/lac/trilinos_precondition_ml.cc index 3b4195c42c..c5e863599c 100644 --- a/source/lac/trilinos_precondition_ml.cc +++ b/source/lac/trilinos_precondition_ml.cc @@ -21,6 +21,8 @@ # include # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS + # include # include # include @@ -29,6 +31,8 @@ # include # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS + DEAL_II_NAMESPACE_OPEN namespace TrilinosWrappers diff --git a/source/lac/trilinos_solver.cc b/source/lac/trilinos_solver.cc index d1b5705135..c6cd7a2bb5 100644 --- a/source/lac/trilinos_solver.cc +++ b/source/lac/trilinos_solver.cc @@ -22,12 +22,16 @@ # include # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS + # include # include # include # include # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS + # include # include # include diff --git a/source/lac/trilinos_sparse_matrix.cc b/source/lac/trilinos_sparse_matrix.cc index ff8490bdcd..78c2616336 100644 --- a/source/lac/trilinos_sparse_matrix.cc +++ b/source/lac/trilinos_sparse_matrix.cc @@ -29,6 +29,7 @@ # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # ifdef DEAL_II_TRILINOS_WITH_EPETRAEXT # include # endif @@ -36,6 +37,7 @@ # include # include # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # include diff --git a/source/lac/trilinos_sparsity_pattern.cc b/source/lac/trilinos_sparsity_pattern.cc index 0b3f262eb3..d0ccc47fad 100644 --- a/source/lac/trilinos_sparsity_pattern.cc +++ b/source/lac/trilinos_sparsity_pattern.cc @@ -23,7 +23,9 @@ # include # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # include diff --git a/source/lac/trilinos_vector.cc b/source/lac/trilinos_vector.cc index b64bb9cb5f..e4d5a20ced 100644 --- a/source/lac/trilinos_vector.cc +++ b/source/lac/trilinos_vector.cc @@ -26,9 +26,11 @@ # include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS # include # include