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

atomics bugfix for win32

metadata
Wenzel Jakob 2011-02-15 16:01:55 +01:00
parent f43f278a6b
commit 16f2454388
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,10 @@ MTS_NAMESPACE_BEGIN
#include <libkern/OSAtomic.h> #include <libkern/OSAtomic.h>
#endif #endif
#if defined(WIN32)
#include <intrin.h>
#endif
/* The following implementations are based on PBRT */ /* The following implementations are based on PBRT */
template <typename T> inline bool atomicCompareAndExchangePtr(T **v, T *newValue, T *oldValue) { template <typename T> inline bool atomicCompareAndExchangePtr(T **v, T *newValue, T *oldValue) {
@ -61,7 +65,7 @@ inline bool atomicCompareAndExchange(volatile int32_t *v, int32_t newValue, int3
inline bool atomicCompareAndExchange(volatile int64_t *v, int64_t newValue, int64_t oldValue) { inline bool atomicCompareAndExchange(volatile int64_t *v, int64_t newValue, int64_t oldValue) {
#if defined(WIN32) #if defined(WIN32)
return InterlockedCompareExchange64( return _InterlockedCompareExchange64(
reinterpret_cast<volatile LONGLONG *>(v), newValue, oldValue) == oldValue; reinterpret_cast<volatile LONGLONG *>(v), newValue, oldValue) == oldValue;
#else #else
return __sync_bool_compare_and_swap(v, oldValue, newValue); return __sync_bool_compare_and_swap(v, oldValue, newValue);