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

win32 build fixes

metadata
Wenzel Jakob 2011-02-15 15:30:48 +01:00
parent f4638907bd
commit f81264cd04
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/mitsuba/core/aabb.h
View File

@ -305,6 +305,11 @@ public:
: TAABB<Point>(min, max) { : TAABB<Point>(min, max) {
} }
/// Construct from a TAABB<Point>
inline AABB(const TAABB<Point> &aabb)
: min(aabb.min), max(aabb.max) {
}
/// Calculate the surface area of the bounding box /// Calculate the surface area of the bounding box
inline Float getSurfaceArea() const { inline Float getSurfaceArea() const {
Vector d = max - min; Vector d = max - min;

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

@ -53,16 +53,16 @@ template <typename T> inline bool atomicCompareAndExchangePtr(T **v, T *newValue
inline bool atomicCompareAndExchange(volatile int32_t *v, int32_t newValue, int32_t oldValue) { inline bool atomicCompareAndExchange(volatile int32_t *v, int32_t newValue, int32_t oldValue) {
#if defined(WIN32) #if defined(WIN32)
return InterlockedCompareExchange( return InterlockedCompareExchange(
reinterpret_cast<volatile int32_t *>(v), newValue, oldValue) == oldValue; reinterpret_cast<volatile LONG *>(v), newValue, oldValue) == oldValue;
#else #else
return __sync_bool_compare_and_swap(v, oldValue, newValue); return __sync_bool_compare_and_swap(v, oldValue, newValue);
#endif #endif
} }
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(WIN64) #if defined(WIN32)
return InterlockedCompareExchange64( return InterlockedCompareExchange64(
reinterpret_cast<volatile int64_t *>(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);
#endif #endif