diff options
| author | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-11-23 01:52:11 +0100 |
|---|---|---|
| committer | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-11-23 01:52:11 +0100 |
| commit | 8edd7e94b1f294fe71e9c0d0b5bfa1b7ef7e11cc (patch) | |
| tree | a06886cf72fab1c42d56f97ae7d81c5e945dc1a7 | |
| parent | be1fd73390cab288c75ef99e704f3aa195a0c4ac (diff) | |
| parent | 4f388eacf6395a380270815138e0684fefd7b6c3 (diff) | |
merged CTS-323: Don't cast pointers to U32
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/llmath/llsimdmath.h | 6 | ||||
| -rw-r--r-- | indra/llmath/llvolume.cpp | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 148abe49ed..ae2724379e 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -171,6 +171,7 @@ blino Nakamura VWR-17 Boroondas Gupte CTS-320 + CTS-323 SNOW-278 SNOW-503 SNOW-510 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; |