From b6e0e819242f9de25fe1fc05c068c42ef55e96be Mon Sep 17 00:00:00 2001 From: Robert Chen Date: Fri, 13 Sep 2024 17:29:38 -0700 Subject: [PATCH] Remove need for T() in ValLoc. --- include/RAJA/pattern/params/params_base.hpp | 2 -- include/RAJA/util/SoAPtr.hpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/include/RAJA/pattern/params/params_base.hpp b/include/RAJA/pattern/params/params_base.hpp index 313decc429..51f05a69a6 100644 --- a/include/RAJA/pattern/params/params_base.hpp +++ b/include/RAJA/pattern/params/params_base.hpp @@ -23,8 +23,6 @@ namespace expt RAJA_HOST_DEVICE constexpr bool operator<(const ValLoc& rhs) const { return val < rhs.val; } RAJA_HOST_DEVICE constexpr bool operator>(const ValLoc& rhs) const { return val > rhs.val; } - RAJA_HOST_DEVICE constexpr explicit operator T() const { return val; } - RAJA_HOST_DEVICE constexpr value_type getVal() const {return val;} RAJA_HOST_DEVICE constexpr index_type getLoc() const {return loc;} diff --git a/include/RAJA/util/SoAPtr.hpp b/include/RAJA/util/SoAPtr.hpp index 717d7418ca..6adea65b80 100644 --- a/include/RAJA/util/SoAPtr.hpp +++ b/include/RAJA/util/SoAPtr.hpp @@ -230,7 +230,7 @@ class SoAPtr, mempool, accessor> } RAJA_HOST_DEVICE void set(size_t i, value_type val) { - accessor::set(mem, i, first_type(val)); + accessor::set(mem, i, val.getVal()); accessor::set(mem_idx, i, val.getLoc()); }