From: Wolfgang Bangerth Date: Mon, 31 Mar 2025 21:57:03 +0000 (-0600) Subject: Remove the inclusion of Kokkos_Macros.h from config.h. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=980e009f234c95faf0ac38740d1f0863f7aee540;p=dealii.git Remove the inclusion of Kokkos_Macros.h from config.h. --- diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in index d44c26af26..8a77186be2 100644 --- a/include/deal.II/base/config.h.in +++ b/include/deal.II/base/config.h.in @@ -15,11 +15,6 @@ #ifndef dealii_config_h #define dealii_config_h -/*********************************************************************** - * Some deal.II macros depends on Kokkos macros: - */ -#include - /*********************************************************************** * Information about deal.II: */ diff --git a/include/deal.II/base/exceptions.h b/include/deal.II/base/exceptions.h index 7f85c4f900..f19a886004 100644 --- a/include/deal.II/base/exceptions.h +++ b/include/deal.II/base/exceptions.h @@ -17,9 +17,6 @@ #include -#include -#include - // The exception machinery (including the macros defined in // exception_macros.h) references Kokkos functions. The places that // use exceptions must know about these functions, and to avoid them @@ -34,6 +31,8 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS DEAL_II_ENABLE_EXTRA_DIAGNOSTICS +#include + #include #include #include diff --git a/include/deal.II/base/numbers.h b/include/deal.II/base/numbers.h index f8ab4f785d..0440d9a920 100644 --- a/include/deal.II/base/numbers.h +++ b/include/deal.II/base/numbers.h @@ -18,6 +18,7 @@ #include +#include #include #include