Merge branch 'develop'

1 files changed, 18 insertions, 14 deletions

diff --git a/src/core/function/SecureMemoryAllocator.cpp b/src/core/function/SecureMemoryAllocator.cpp
index fccd09fe..651e4085 100644
--- a/src/core/function/SecureMemoryAllocator.cpp
+++ b/src/core/function/SecureMemoryAllocator.cpp
@@ -28,36 +28,40 @@
 
 #include "SecureMemoryAllocator.h"
 
-#if !defined(MACOS) && defined(DEBUG)
+#ifndef MACOS
+
 #include <mimalloc.h>
-#endif
 
 namespace GpgFrontend {
 
 auto SecureMemoryAllocator::Allocate(std::size_t size) -> void* {
-#if !defined(MACOS) && defined(DEBUG)
   auto* addr = mi_malloc(size);
-#else
-  auto* addr = malloc(size);
-#endif
   return addr;
 }
 
 auto SecureMemoryAllocator::Reallocate(void* ptr, std::size_t size) -> void* {
-#if !defined(MACOS) && defined(DEBUG)
   auto* addr = mi_realloc(ptr, size);
+  return addr;
+}
+
+void SecureMemoryAllocator::Deallocate(void* p) { mi_free(p); }
+
 #else
+
+namespace GpgFrontend {
+
+auto SecureMemoryAllocator::Allocate(std::size_t size) -> void* {
+  auto* addr = malloc(size);
+  return addr;
+}
+
+auto SecureMemoryAllocator::Reallocate(void* ptr, std::size_t size) -> void* {
   auto* addr = realloc(ptr, size);
-#endif
   return addr;
 }
 
-void SecureMemoryAllocator::Deallocate(void* p) {
-#if !defined(MACOS) && defined(DEBUG)
-  mi_free(p);
-#else
-  free(p);
+void SecureMemoryAllocator::Deallocate(void* p) { free(p); }
+
 #endif
-}
 
 }  // namespace GpgFrontend
\ No newline at end of file