From 5142300b2efca6a61008002255adc7bb1043cf9f Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Wed, 22 Sep 2021 12:22:52 -0400 Subject: [PATCH] undo "risky" C++20 related changes --- src/DPD-REACT/random_external_state.h | 4 ++-- src/KOKKOS/kokkos_type.h | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/DPD-REACT/random_external_state.h b/src/DPD-REACT/random_external_state.h index 9a69392a3b..503118f0bf 100644 --- a/src/DPD-REACT/random_external_state.h +++ b/src/DPD-REACT/random_external_state.h @@ -78,8 +78,8 @@ namespace random_external_state { typedef uint64_t es_RNG_t; -constexpr uint32_t MAX_URAND = 0xffffffffU; -constexpr uint64_t MAX_URAND64 = 0xffffffffffffffffULL - 1; +enum { MAX_URAND = 0xffffffffU }; +enum { MAX_URAND64 = 0xffffffffffffffffULL - 1 }; LAMMPS_INLINE uint32_t es_urand(es_RNG_t &state_) diff --git a/src/KOKKOS/kokkos_type.h b/src/KOKKOS/kokkos_type.h index 44fa9f2ecb..05c839db3f 100644 --- a/src/KOKKOS/kokkos_type.h +++ b/src/KOKKOS/kokkos_type.h @@ -25,9 +25,7 @@ #include #include -constexpr unsigned int FULL = 1u; -constexpr unsigned int HALFTHREAD = 2u; -constexpr unsigned int HALF = 4u; +enum{FULL=1u,HALFTHREAD=2u,HALF=4u}; #if defined(KOKKOS_ENABLE_CXX11) #undef ISFINITE