summaryrefslogtreecommitdiff
path: root/indra/llcommon/llcommon.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llcommon/llcommon.cpp')
-rw-r--r--indra/llcommon/llcommon.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/llcommon/llcommon.cpp b/indra/llcommon/llcommon.cpp
index da61e7539a..5d4a623bf6 100644
--- a/indra/llcommon/llcommon.cpp
+++ b/indra/llcommon/llcommon.cpp
@@ -34,14 +34,13 @@
#include "llcleanup.h"
#if (TRACY_ENABLE)
-// Override new/delet for tracy memory profiling
+// Override new/delete for tracy memory profiling
void *operator new(size_t size)
{
auto ptr = (malloc) (size);
if (!ptr)
{
throw std::bad_alloc();
- return nullptr;
}
TracyAlloc(ptr, size);
return ptr;
@@ -62,7 +61,7 @@ void operator delete(void *ptr) noexcept
void *tracy_aligned_malloc(size_t size, size_t alignment)
{
- auto ptr = (_aligned_malloc) (size, alignment);
+ auto ptr = ll_aligned_malloc_fallback(size, alignment);
if (ptr) TracyAlloc(ptr, size);
return ptr;
}
@@ -70,7 +69,7 @@ void *tracy_aligned_malloc(size_t size, size_t alignment)
void tracy_aligned_free(void *memblock)
{
TracyFree(memblock);
- (_aligned_free)(memblock);
+ ll_aligned_free_fallback(memblock);
}
#endif