diff options
| author | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-10-24 16:07:43 +0200 |
|---|---|---|
| committer | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-10-24 16:07:43 +0200 |
| commit | 32b0747e3385c6c44f4c1f5beca063d89006453d (patch) | |
| tree | d4e286f356b31f3931f7a2455de9b2a8a0c9960c /indra/llmath/llvolume.cpp | |
| parent | d40db3d8e19fdcc024ca08e901d542bf9c552458 (diff) | |
| parent | e2049c332b9b834e843249c1ae0ba8542491940f (diff) | |
CTS-323: (part 2 of 2) 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 c73f0e2755..c12c62e8d9 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -35,6 +35,7 @@ #include "llmath.h" #include <set> +#include <stdint.h> #include "llerror.h" #include "llmemtype.h" @@ -96,9 +97,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; |