tx258/lammps-gran-kokkos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

undo "risky" C++20 related changes

Browse Source
This commit is contained in:
Axel Kohlmeyer
2021-09-22 12:22:52 -04:00
parent d89e6f6765
commit 5142300b2e
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/DPD-REACT/random_external_state.h
View File

@ -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_)

4
src/KOKKOS/kokkos_type.h
View File

@ -25,9 +25,7 @@
#include <Kokkos_ScatterView.hpp>
#include <Kokkos_UnorderedMap.hpp>
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