From 418fb71411d4f14c8feab6024cc0c6b5258fb0a1 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Thu, 2 Feb 2023 08:16:39 -0500 Subject: [PATCH] ifdef KOKKOS_VERSION -> if KOKKOS_VERSION --- include/deal.II/base/exceptions.h | 4 ++-- include/deal.II/base/tensor.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/deal.II/base/exceptions.h b/include/deal.II/base/exceptions.h index 72a08d81d0..af4fe88c84 100644 --- a/include/deal.II/base/exceptions.h +++ b/include/deal.II/base/exceptions.h @@ -1508,7 +1508,7 @@ namespace deal_II_exceptions * @ingroup Exceptions */ #ifdef DEBUG -# ifdef KOKKOS_VERSION >= 30600 +# if KOKKOS_VERSION >= 30600 # ifdef DEAL_II_HAVE_BUILTIN_EXPECT # define Assert(cond, exc) \ { \ @@ -1550,7 +1550,7 @@ namespace deal_II_exceptions })) \ } # endif /*ifdef DEAL_II_HAVE_BUILTIN_EXPECT*/ -# else /*ifdef KOKKOS_VERSION >= 30600*/ +# else /*if KOKKOS_VERSION >= 30600*/ # ifdef KOKKOS_ACTIVE_EXECUTION_MEMORY_SPACE_HOST # ifdef DEAL_II_HAVE_BUILTIN_EXPECT # define Assert(cond, exc) \ diff --git a/include/deal.II/base/tensor.h b/include/deal.II/base/tensor.h index 4bc8797b08..0640562ef4 100644 --- a/include/deal.II/base/tensor.h +++ b/include/deal.II/base/tensor.h @@ -1160,7 +1160,7 @@ namespace internal constexpr DEAL_II_HOST_DEVICE_ALWAYS_INLINE void multiply_assign_scalar(std::complex &val, const OtherNumber &s) { -# ifdef KOKKOS_VERSION >= 30600 +# if KOKKOS_VERSION >= 30600 KOKKOS_IF_ON_HOST((val *= s;)) KOKKOS_IF_ON_DEVICE(({ (void)val; -- 2.39.5