diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-09-28 22:09:02 -0400 | 
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-09-28 22:09:02 -0400 | 
| commit | db86ec9176dcbfabe5fddb3603da4132443f8b7f (patch) | |
| tree | 37dcf05a02ba41d8c5e58deb8c43034fea01ccf6 /indra/llcommon | |
| parent | 548bfda290b556d3ab29cc8c2f810f4cc349c9d8 (diff) | |
SL-16040: _aligned_malloc() and _aligned_free() are Microsoft only.
Fortunately we already have platform-independent wrappers in llmemory.h.
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llcommon.cpp | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/indra/llcommon/llcommon.cpp b/indra/llcommon/llcommon.cpp index 92f4d569b1..5d4a623bf6 100644 --- a/indra/llcommon/llcommon.cpp +++ b/indra/llcommon/llcommon.cpp @@ -61,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;  } @@ -69,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 | 
