diff options
| author | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-09-30 01:21:04 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-09-30 01:21:04 +0300 |
| commit | f64a10ca8f2f7abbb9e0cd444e45fb5d9306f36d (patch) | |
| tree | 4de3911f36a46e69dcde3dc88dc5b8742ea1e794 /indra/llcommon/llmemory.h | |
| parent | 883d44388b885711cabd40ffbce75c9e22903c3b (diff) | |
| parent | 2d52b62e67cf46222396c724d00d2de874819197 (diff) | |
Merge downstream code, version 3.8.5
Diffstat (limited to 'indra/llcommon/llmemory.h')
| -rwxr-xr-x | indra/llcommon/llmemory.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h index fd09eb9deb..0fb257aab1 100755 --- a/indra/llcommon/llmemory.h +++ b/indra/llcommon/llmemory.h @@ -28,6 +28,7 @@ #include "linden_common.h" #include "llunits.h" +#include "stdtypes.h" #if !LL_WINDOWS #include <stdint.h> #endif @@ -59,7 +60,7 @@ class LLMutex ; LL_COMMON_API void ll_assert_aligned_func(uintptr_t ptr,U32 alignment); #ifdef SHOW_ASSERT -#define ll_assert_aligned(ptr,alignment) ll_assert_aligned_func(reinterpret_cast<uintptr_t>(ptr),((U32)alignment)) +#define ll_assert_aligned(ptr,alignment) ll_assert_aligned_func(uintptr_t(ptr),((U32)alignment)) #else #define ll_assert_aligned(ptr,alignment) #endif @@ -69,13 +70,13 @@ LL_COMMON_API void ll_assert_aligned_func(uintptr_t ptr,U32 alignment); template <typename T> T* LL_NEXT_ALIGNED_ADDRESS(T* address) { return reinterpret_cast<T*>( - (reinterpret_cast<uintptr_t>(address) + 0xF) & ~0xF); + (uintptr_t(address) + 0xF) & ~0xF); } template <typename T> T* LL_NEXT_ALIGNED_ADDRESS_64(T* address) { return reinterpret_cast<T*>( - (reinterpret_cast<uintptr_t>(address) + 0x3F) & ~0x3F); + (uintptr_t(address) + 0x3F) & ~0x3F); } #if LL_LINUX || LL_DARWIN |