]> https://gitweb.dealii.org/ - dealii.git/commitdiff
ifdef KOKKOS_VERSION -> if KOKKOS_VERSION
authorDaniel Arndt <arndtd@ornl.gov>
Thu, 2 Feb 2023 13:16:39 +0000 (08:16 -0500)
committerDaniel Arndt <arndtd@ornl.gov>
Thu, 2 Feb 2023 13:16:39 +0000 (08:16 -0500)
include/deal.II/base/exceptions.h
include/deal.II/base/tensor.h

index 72a08d81d03dc86b4cad5ac8b3fb5a8205d625ca..af4fe88c84c9354a01b3f4c9a41ccdad976447a2 100644 (file)
@@ -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)                                            \
index 4bc8797b080bdad28751063623f87f552a8facec..0640562ef4f06dda0551ae94e0897a521babfa69 100644 (file)
@@ -1160,7 +1160,7 @@ namespace internal
     constexpr DEAL_II_HOST_DEVICE_ALWAYS_INLINE void
     multiply_assign_scalar(std::complex<Number> &val, const OtherNumber &s)
     {
-#  ifdef KOKKOS_VERSION >= 30600
+#  if KOKKOS_VERSION >= 30600
       KOKKOS_IF_ON_HOST((val *= s;))
       KOKKOS_IF_ON_DEVICE(({
         (void)val;

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.