summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRunitai Linden <davep@lindenlab.com>2021-10-26 09:23:17 -0500
committerRunitai Linden <davep@lindenlab.com>2021-10-26 09:23:17 -0500
commitc907d067f41930bd6a4bbef9903febfab1090982 (patch)
treeed4f382368555401e1126200ded44e26078dfa8d
parent4e8cd9437bed90b3468b1bf12f545de16faefb67 (diff)
SL-16243 Followup -- fix for inconsistently calling TracyAlloc/TracyFree
-rw-r--r--indra/llcommon/llcommon.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llcommon.cpp b/indra/llcommon/llcommon.cpp
index 04872564bf..25a809dad2 100644
--- a/indra/llcommon/llcommon.cpp
+++ b/indra/llcommon/llcommon.cpp
@@ -44,7 +44,6 @@ void *operator new(size_t size)
{
LL_PROFILE_ZONE_SCOPED;
ptr = (malloc)(size);
- TracyAlloc(ptr, size);
}
else
{
@@ -54,15 +53,16 @@ void *operator new(size_t size)
{
throw std::bad_alloc();
}
+ TracyAlloc(ptr, size);
return ptr;
}
void operator delete(void *ptr) noexcept
{
+ TracyFree(ptr);
if (gProfilerEnabled)
{
LL_PROFILE_ZONE_SCOPED;
- TracyFree(ptr);
(free)(ptr);
}
else