From 2d4ba7275f766d278cb67c38e2c18c5345ec1f47 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Thu, 12 Oct 2023 04:33:28 -0700 Subject: [PATCH] Fix rmemory_allocator Former-commit-id: 0f8c26bc33aab05e357e13f6fa1f974ecb223738 --- include/Kyoto/CARAMManager.hpp | 1 - include/rstl/rmemory_allocator.hpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/Kyoto/CARAMManager.hpp b/include/Kyoto/CARAMManager.hpp index 468f307c..849bf7e7 100644 --- a/include/Kyoto/CARAMManager.hpp +++ b/include/Kyoto/CARAMManager.hpp @@ -50,7 +50,6 @@ private: ARQRequest mRequest; uint mUniqueID; bool mComplete; - }; static bool mbInitialized; diff --git a/include/rstl/rmemory_allocator.hpp b/include/rstl/rmemory_allocator.hpp index 52b55cf8..e8a72fe5 100644 --- a/include/rstl/rmemory_allocator.hpp +++ b/include/rstl/rmemory_allocator.hpp @@ -15,7 +15,7 @@ struct rmemory_allocator { if (size == 0) { out = nullptr; } else { - out = reinterpret_cast< T* >(new uchar[size]); + out = reinterpret_cast< T* >(NEW uchar[size]); } } // TODO: this fixes a regswap in vector::reserve @@ -25,7 +25,7 @@ struct rmemory_allocator { if (size == 0) { return nullptr; } else { - return reinterpret_cast< T* >(new uchar[size]); + return reinterpret_cast< T* >(NEW uchar[size]); } } template < typename T >