From d99b1258e363cbebc15fd8b16fa38e49b149a427 Mon Sep 17 00:00:00 2001 From: Nicholas Curtis Date: Fri, 8 Apr 2022 11:13:31 -0500 Subject: [PATCH] remove volatile to fix build error from Kokkos commit (5574130fb333ac1745a52d4a6383ac95c64bdc0f) --- src/KOKKOS/domain_kokkos.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/KOKKOS/domain_kokkos.cpp b/src/KOKKOS/domain_kokkos.cpp index 6a1decbed6..50ba6cc280 100644 --- a/src/KOKKOS/domain_kokkos.cpp +++ b/src/KOKKOS/domain_kokkos.cpp @@ -57,8 +57,8 @@ public: } KOKKOS_INLINE_FUNCTION - void join(volatile value_type &dst, - const volatile value_type &src) const { + void join(value_type &dst, + const value_type &src) const { dst.value[0][0] = MIN(dst.value[0][0],src.value[0][0]); dst.value[0][1] = MAX(dst.value[0][1],src.value[0][1]); dst.value[1][0] = MIN(dst.value[1][0],src.value[1][0]);