diff options
| author | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-10-24 16:13:31 +0200 |
|---|---|---|
| committer | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-10-24 16:13:31 +0200 |
| commit | 4f388eacf6395a380270815138e0684fefd7b6c3 (patch) | |
| tree | 496efe17c4b6635be8463004b194dcc4b4b1a1c3 /indra/llmath/llvolume.cpp | |
| parent | 7863674626bcf16ad26f3bb8e77a6ca41998c36b (diff) | |
| parent | 32b0747e3385c6c44f4c1f5beca063d89006453d (diff) | |
merged CTS-323: Don't cast pointers to U32
Diffstat (limited to 'indra/llmath/llvolume.cpp')
| -rw-r--r-- | indra/llmath/llvolume.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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; |