mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

another atomic bugfix

metadata
Wenzel Jakob 2011-02-16 18:04:16 +01:00
parent c008800ab6
commit c662679854
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/mitsuba/core/atomic.h
View File

@ -122,7 +122,7 @@ inline double atomicAdd(volatile double *dst, double delta) {
inline int32_t atomicAdd(volatile int32_t *dst, int32_t delta) {
#if defined(WIN32)
return InterlockedAdd(dst, delta);
return InterlockedExchangeAdd(dst, delta) + delta;
#else
return __sync_add_and_fetch(dst, delta);
#endif
@ -134,9 +134,12 @@ inline int32_t atomicAdd(volatile int32_t *dst, int32_t delta) {
* \return The final value written to \a dst
*/
inline int32_t atomicAdd(volatile int64_t *dst, int64_t delta) {
#if defined(WIN32)
return _InterlockedAdd64(dst, delta);
inline int64_t atomicAdd(volatile int64_t *dst, int64_t delta) {
#if defined(WIN64)
return _InterlockedExchangeAdd64(dst, delta) + delta;
#elif defined(WIN32)
SLog(EError, "atomicAdd() cannot handle 64-bit integers on WIN32");
return 0;
#else
return __sync_add_and_fetch(dst, delta);
#endif