summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
authorBoroondas Gupte <hg@boroon.dasgupta.ch>2010-10-24 16:13:31 +0200
committerBoroondas Gupte <hg@boroon.dasgupta.ch>2010-10-24 16:13:31 +0200
commit4f388eacf6395a380270815138e0684fefd7b6c3 (patch)
tree496efe17c4b6635be8463004b194dcc4b4b1a1c3 /indra/llmath
parent7863674626bcf16ad26f3bb8e77a6ca41998c36b (diff)
parent32b0747e3385c6c44f4c1f5beca063d89006453d (diff)
merged CTS-323: Don't cast pointers to U32
Diffstat (limited to 'indra/llmath')
-rw-r--r--indra/llmath/llsimdmath.h6
-rw-r--r--indra/llmath/llvolume.cpp5
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 0fe309ddf3..6dd5c8e5c8 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,9 +91,9 @@ 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)
{
- U32 t = (U32) ptr;
+ uintptr_t t = (uintptr_t) ptr;
if (t%alignment != 0)
{
llerrs << "WTF?" << llendl;