]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Remove the inclusion of Kokkos_Macros.h from config.h. 18309/head
authorWolfgang Bangerth <bangerth@colostate.edu>
Mon, 31 Mar 2025 21:57:03 +0000 (15:57 -0600)
committerWolfgang Bangerth <bangerth@colostate.edu>
Tue, 1 Apr 2025 02:42:12 +0000 (20:42 -0600)
include/deal.II/base/config.h.in
include/deal.II/base/exceptions.h
include/deal.II/base/numbers.h

index d44c26af26c97b13a5516988b12164748e6e1f01..8a77186be2b97a391dc59630743e202ffad92676 100644 (file)
 #ifndef dealii_config_h
 #define dealii_config_h
 
-/***********************************************************************
- * Some deal.II macros depends on Kokkos macros:
- */
-#include <Kokkos_Macros.hpp>
-
 /***********************************************************************
  * Information about deal.II:
  */
index 7f85c4f900b9134970e4848123a6918b852dff8f..f19a886004c5890cd68998833b92fb7c193d7095 100644 (file)
@@ -17,9 +17,6 @@
 
 #include <deal.II/base/config.h>
 
-#include <deal.II/base/exception_macros.h>
-#include <deal.II/base/numbers.h>
-
 // 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 <deal.II/base/exception_macros.h>
+
 #include <exception>
 #include <ostream>
 #include <string>
index f8ab4f785dd103ce38230c06dff62ddea58bb5bb..0440d9a920a251e1ffe8d495e94e73ea963a6359 100644 (file)
@@ -18,6 +18,7 @@
 
 #include <deal.II/base/config.h>
 
+#include <deal.II/base/exceptions.h>
 #include <deal.II/base/types.h>
 
 #include <cmath>

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.