Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2016-02-01 16:52:43 +01:00
parent 22df27632a 56be55c7a3
commit 0ec86d5af3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Basics/random.cpp
View File

@ -43,16 +43,16 @@ static unsigned long SeedRandom(void) {
/* ignore result */ gettimeofday(&tv, 0);
seed = (unsigned long)(tv.tv_sec);
seed ^= (unsigned long)(tv.tv_usec);
seed = static_cast<decltype(seed)>(tv.tv_sec);
seed ^= static_cast<decltype(seed)>(tv.tv_usec);
#else
seed = (unsigned long)time(0);
seed = static_cast<decltype(seed)>(time(0));
#endif
seed ^= (unsigned long)((uint32_t) TRI_CurrentProcessId() << 8);
seed ^= (unsigned long)((uint32_t) TRI_CurrentProcessId() << 16);
seed ^= (unsigned long)((uint32_t) TRI_CurrentProcessId() << 24);
seed ^= (unsigned long)((uint32_t) TRI_CurrentThreadId());
seed ^= static_cast<decltype(seed)>((uint32_t) TRI_CurrentProcessId() << 8);
seed ^= static_cast<decltype(seed)>((uint32_t) TRI_CurrentProcessId() << 16);
seed ^= static_cast<decltype(seed)>((uint32_t) TRI_CurrentProcessId() << 24);
seed ^= static_cast<decltype(seed)>(reinterpret_cast<std::conditional<std::is_pointer<TRI_tid_t>::value, uintptr_t, uint32_t>::type>(TRI_CurrentThreadId()));
return seed;
}