From 366a9b0522a7f28eec24e83ac7c9634cd4ceece8 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 22 Apr 2025 19:25:22 -0600 Subject: [PATCH] Disentangle the order in a file. --- include/deal.II/lac/generic_linear_algebra.h | 39 ++++++++------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/include/deal.II/lac/generic_linear_algebra.h b/include/deal.II/lac/generic_linear_algebra.h index 4f74931730..cd7dec4d77 100644 --- a/include/deal.II/lac/generic_linear_algebra.h +++ b/include/deal.II/lac/generic_linear_algebra.h @@ -24,10 +24,23 @@ #include #include +#ifdef DEAL_II_WITH_PETSC +# include +# include +# include +# include +#endif -DEAL_II_NAMESPACE_OPEN +#ifdef DEAL_II_WITH_TRILINOS +# include +# include +# include +# include +#endif +DEAL_II_NAMESPACE_OPEN + /** * A namespace in which the deal.II linear algebra classes are aliased to * generic names. There are similar namespaces LinearAlgebraPETSc and @@ -63,18 +76,8 @@ namespace LinearAlgebraDealII } // namespace LinearAlgebraDealII -DEAL_II_NAMESPACE_CLOSE - - #ifdef DEAL_II_WITH_PETSC -# include -# include -# include -# include - -DEAL_II_NAMESPACE_OPEN - /** * A namespace in which the wrappers to the PETSc linear algebra classes are * aliased to generic names. There are similar namespaces @@ -154,20 +157,10 @@ namespace LinearAlgebraPETSc } // namespace MPI } // namespace LinearAlgebraPETSc -DEAL_II_NAMESPACE_CLOSE - - #endif // DEAL_II_WITH_PETSC #ifdef DEAL_II_WITH_TRILINOS -# include -# include -# include -# include - -DEAL_II_NAMESPACE_OPEN - /** * A namespace in which the wrappers to the Trilinos linear algebra classes * are aliased to generic names. There are similar namespaces @@ -250,11 +243,9 @@ namespace LinearAlgebraTrilinos } // namespace LinearAlgebraTrilinos -DEAL_II_NAMESPACE_CLOSE - #endif // DEAL_II_WITH_TRILINOS - +DEAL_II_NAMESPACE_CLOSE #endif -- 2.39.5