diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-09-12 14:36:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-09-12 14:36:37 -0400 |
| commit | 97d969a338c1e4f973eb817ba7701aff51a02ccb (patch) | |
| tree | 7e22b1d1f6fa600196dc9310364e45f563eab68e /indra/llcommon/llmemory.cpp | |
| parent | 094dc91d0dae4971f6ae89840d791466a6fd6d08 (diff) | |
initial attempt to restore changes that make removing tcmalloc possible; not tested
Diffstat (limited to 'indra/llcommon/llmemory.cpp')
| -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 --- 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() { |