diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-12-17 16:06:32 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-12-17 16:06:32 -0500 |
| commit | 089f9d6d370daed06c3b69d8567f65fc97300dc0 (patch) | |
| tree | d38c25c10463b58a6ad03ad5f11e4acfc293a60f /indra | |
| parent | ed25bfc431bd209cb78890842ac8fabf5d6ba060 (diff) | |
| parent | 8edd7e94b1f294fe71e9c0d0b5bfa1b7ef7e11cc (diff) | |
merging in fix for CTS-323 / SH-464
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llmath/llsimdmath.h | 6 | ||||
| -rw-r--r-- | indra/llmath/llvolume.cpp | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/indra/llmath/llsimdmath.h b/indra/llmath/llsimdmath.h index d6debce2d7..b6ac5190a7 100644 --- a/indra/llmath/llsimdmath.h +++ b/indra/llmath/llsimdmath.h @@ -35,16 +35,18 @@ #error SSE2 not enabled. LLVector4a and related class will not compile. #endif +#include <stdint.h> + template <typename T> T* LL_NEXT_ALIGNED_ADDRESS(T* address) { return reinterpret_cast<T*>( - (reinterpret_cast<U32>(address) + 0xF) & ~0xF); + (reinterpret_cast<uintptr_t>(address) + 0xF) & ~0xF); } template <typename T> T* LL_NEXT_ALIGNED_ADDRESS_64(T* address) { return reinterpret_cast<T*>( - (reinterpret_cast<U32>(address) + 0x3F) & ~0x3F); + (reinterpret_cast<uintptr_t>(address) + 0x3F) & ~0x3F); } #if LL_LINUX || LL_DARWIN diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index c20124076b..c0b50b606e 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -29,6 +29,7 @@ #include "llmath.h" #include <set> +#include <stdint.h> #include "llerror.h" #include "llmemtype.h" @@ -90,10 +91,10 @@ const S32 SCULPT_MIN_AREA_DETAIL = 1; extern BOOL gDebugGL; -void assert_aligned(void* ptr, U32 alignment) +void assert_aligned(void* ptr, uintptr_t alignment) { #if 0 - U32 t = (U32) ptr; + uintptr_t t = (uintptr_t) ptr; if (t%alignment != 0) { llerrs << "WTF?" << llendl; |