diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-27 14:18:22 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-27 14:18:22 -0400 |
| commit | 2c3e78f1f1f5851482e5e63d37af1325f3a19550 (patch) | |
| tree | 1871ea15c18377defe5e20a198baf8072e791efc /indra/llcommon/llmemory.cpp | |
| parent | eb03da6e993eb33e1fef9bf53268c66d325adf9a (diff) | |
| parent | c9f1b1b5113031d5879e8fcdcec263626a7d3122 (diff) | |
merge changes for DRTVWR-167
Diffstat (limited to 'indra/llcommon/llmemory.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/llcommon/llmemory.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp index 3b9758f996..afaf366668 100644..100755 --- a/indra/llcommon/llmemory.cpp +++ b/indra/llcommon/llmemory.cpp @@ -61,6 +61,18 @@ BOOL LLMemory::sEnableMemoryFailurePrevention = FALSE; LLPrivateMemoryPoolManager::mem_allocation_info_t LLPrivateMemoryPoolManager::sMemAllocationTracker; #endif +void ll_assert_aligned_func(uintptr_t ptr,U32 alignment) +{ +#ifdef SHOW_ASSERT + // Redundant, place to set breakpoints. + if (ptr%alignment!=0) + { + llwarns << "alignment check failed" << llendl; + } + llassert(ptr%alignment==0); +#endif +} + //static void LLMemory::initClass() { |