From 7faf61d6b07404b0c1b20c09e7bc1cebc4713450 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Thu, 29 May 2025 13:37:08 -0600 Subject: [PATCH] Move some forward declarations. --- .../differentiation/ad/sacado_number_types.h | 42 +++++++++---------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/include/deal.II/differentiation/ad/sacado_number_types.h b/include/deal.II/differentiation/ad/sacado_number_types.h index d2dd4687c8..696b8f7f8d 100644 --- a/include/deal.II/differentiation/ad/sacado_number_types.h +++ b/include/deal.II/differentiation/ad/sacado_number_types.h @@ -17,6 +17,23 @@ #include +#include +#include + +#include +#include + +#ifdef DEAL_II_TRILINOS_WITH_SACADO +// It appears that some versions of Trilinos do not directly or indirectly +// include all the headers for all forward and reverse Sacado AD types +// in Sacado.hpp, so we also directly include these here as a precaution: +# include +# include +# include + +# include +#endif + #include @@ -60,29 +77,9 @@ namespace Differentiation } // namespace Differentiation -DEAL_II_NAMESPACE_CLOSE - - #ifdef DEAL_II_TRILINOS_WITH_SACADO -# include -# include - -# include -# include - -// It appears that some versions of Trilinos do not directly or indirectly -// include all the headers for all forward and reverse Sacado AD types -// in Sacado.hpp, so we also directly include these here as a precaution: -# include -# include -# include - -# include - -DEAL_II_NAMESPACE_OPEN - namespace Differentiation { @@ -901,10 +898,9 @@ namespace Differentiation # endif // DOXYGEN - -DEAL_II_NAMESPACE_CLOSE +#endif // DEAL_II_TRILINOS_WITH_SACADO -#endif // DEAL_II_TRILINOS_WITH_SACADO +DEAL_II_NAMESPACE_CLOSE #endif -- 2.39.5