nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update eoRNG to fit C++17 standard

Browse source 
ISO C++17 does not allow 'register' storage class specifier
This commit is contained in:
Johann Dreo 2020-03-10 09:11:16 +01:00
commit 2da161fc85
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
eo/src/utils/eoRNG.h
View file

@ -483,9 +483,14 @@ inline void eoRng::initialize(uint32_t seed)
{ {
left = -1; left = -1;
// ISO C++17 does not allow 'register' storage class specifier
#if __cplusplus < 201703L
register uint32_t x = (seed | 1U) & 0xFFFFFFFFU, *s = state; register uint32_t x = (seed | 1U) & 0xFFFFFFFFU, *s = state;
register int j; register int j;
#else
uint32_t x = (seed | 1U) & 0xFFFFFFFFU, *s = state;
int j;
#endif
for(left=0, *s++=x, j=N; --j; for(left=0, *s++=x, j=N; --j;
*s++ = (x*=69069U) & 0xFFFFFFFFU) ; *s++ = (x*=69069U) & 0xFFFFFFFFU) ;
} }
@ -494,8 +499,14 @@ inline void eoRng::initialize(uint32_t seed)
inline uint32_t eoRng::restart() inline uint32_t eoRng::restart()
{ {
// ISO C++17 does not allow 'register' storage class specifier
#if __cplusplus < 201703L
register uint32_t *p0=state, *p2=state+2, *pM=state+M, s0, s1; register uint32_t *p0=state, *p2=state+2, *pM=state+M, s0, s1;
register int j; register int j;
#else
uint32_t *p0=state, *p2=state+2, *pM=state+M, s0, s1;
int j;
#endif
left=N-1, next=state+1; left=N-1, next=state+1;