From 64077d23adac9da7bf0ad3f2ea5d09ae0a73e693 Mon Sep 17 00:00:00 2001
From: Damien L-G <dalg24@gmail.com>
Date: Tue, 30 Sep 2025 18:34:43 -0400
Subject: [PATCH 1/2] Require KOKKOS_ENABLE_DEPRECATED_CODE_5 to be defined for
 including <Kokkos_ArithTraits.hpp>

Signed-off-by: Damien L-G <dalg24@gmail.com>
---
 common/src/Kokkos_ArithTraits.hpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/common/src/Kokkos_ArithTraits.hpp b/common/src/Kokkos_ArithTraits.hpp
index 7fc6a8790a..72a15469c8 100644
--- a/common/src/Kokkos_ArithTraits.hpp
+++ b/common/src/Kokkos_ArithTraits.hpp
@@ -22,6 +22,10 @@
 
 #include <KokkosKernels_ArithTraits.hpp>
 
+#ifndef KOKKOS_ENABLE_DEPRECATED_CODE_5
+static_assert(false, "this header is deprecated, include <KokkosKernels_ArithTraits.hpp> instead");
+#endif
+
 namespace Kokkos {
 template <typename T>
 using ArithTraits [[deprecated("Use KokkosKernels::ArithTraits from KokkosKernels_ArithTraits.hpp header instead")]] =

From d789cab44fabe54063372b1da3001b64a43048d0 Mon Sep 17 00:00:00 2001
From: Damien L-G <dalg24+github@gmail.com>
Date: Thu, 2 Oct 2025 15:33:47 -0400
Subject: [PATCH 2/2] Apply suggestion from review

Co-authored-by: yasahi-hpc <57478230+yasahi-hpc@users.noreply.github.com>
Signed-off-by: Damien L-G <dalg24+github@gmail.com>
---
 common/src/Kokkos_ArithTraits.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/src/Kokkos_ArithTraits.hpp b/common/src/Kokkos_ArithTraits.hpp
index 72a15469c8..909b0e1201 100644
--- a/common/src/Kokkos_ArithTraits.hpp
+++ b/common/src/Kokkos_ArithTraits.hpp
@@ -23,7 +23,7 @@
 #include <KokkosKernels_ArithTraits.hpp>
 
 #ifndef KOKKOS_ENABLE_DEPRECATED_CODE_5
-static_assert(false, "this header is deprecated, include <KokkosKernels_ArithTraits.hpp> instead");
+static_assert(false, "Header `Kokkos_ArithTraits.hpp` is deprecated, include `KokkosKernels_ArithTraits.hpp` instead");
 #endif
 
 namespace Kokkos {