From 093c54d8ed451e4f602a610f0abd95d9bdfbff43 Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Mon, 7 Feb 2022 14:42:07 -0500
Subject: [PATCH] update to use settings from upstream

---
 lib/kokkos/core/src/desul/atomics/Generic.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/kokkos/core/src/desul/atomics/Generic.hpp b/lib/kokkos/core/src/desul/atomics/Generic.hpp
index fbb3ba4698..19d7a453fa 100644
--- a/lib/kokkos/core/src/desul/atomics/Generic.hpp
+++ b/lib/kokkos/core/src/desul/atomics/Generic.hpp
@@ -10,7 +10,7 @@ SPDX-License-Identifier: (BSD-3-Clause)
 #define DESUL_ATOMICS_GENERIC_HPP_
 
 #include <type_traits>
-#if defined(__GNUC__)
+#if defined(__GNUC__) && (!defined(__clang__))
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #endif
@@ -688,7 +688,7 @@ DESUL_INLINE_FUNCTION bool atomic_compare_exchange_weak(T* const dest,
 #include <desul/atomics/GCC.hpp>
 #include <desul/atomics/HIP.hpp>
 #include <desul/atomics/OpenMP.hpp>
-#if defined(__GNUC__)
+#if defined(__GNUC__) && (!defined(__clang__))
 #pragma GCC diagnostic pop
 #endif
 #endif