From b8a8d41c4ffa27c4c2280b7dfc85c089c6ba2879 Mon Sep 17 00:00:00 2001 From: lganzzzo Date: Thu, 7 Jun 2018 00:45:58 +0300 Subject: [PATCH] removed throw in memory pool delete --- core/base/memory/ObjectPool.hpp | 4 ++-- test/core/base/memory/PerfTest.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/base/memory/ObjectPool.hpp b/core/base/memory/ObjectPool.hpp index 3c788c3f..7bd3aa27 100644 --- a/core/base/memory/ObjectPool.hpp +++ b/core/base/memory/ObjectPool.hpp @@ -100,7 +100,7 @@ static void* operator new(std::size_t sz) { \ \ static void operator delete(void* ptr, std::size_t sz) { \ if(sz != sizeof(TYPE)){ \ - throw std::runtime_error("wrong object size"); \ + oatpp::base::Environment::log(2, #POOL_NAME, "[ERROR|CRITICAL]: MemoryPool malfunction. Deleting object of wrong size"); \ } \ oatpp::base::memory::MemoryPool::free(ptr); \ } \ @@ -136,7 +136,7 @@ static void* operator new(std::size_t sz) { \ \ static void operator delete(void* ptr, std::size_t sz) { \ if(sz != sizeof(TYPE)){ \ - throw std::runtime_error("wrong object size"); \ + oatpp::base::Environment::log(2, #POOL_NAME, "[ERROR|CRITICAL]: MemoryPool malfunction. Deleting object of wrong size"); \ } \ oatpp::base::memory::MemoryPool::free(ptr); \ } \ diff --git a/test/core/base/memory/PerfTest.cpp b/test/core/base/memory/PerfTest.cpp index d04a629a..a3fca971 100644 --- a/test/core/base/memory/PerfTest.cpp +++ b/test/core/base/memory/PerfTest.cpp @@ -46,7 +46,7 @@ namespace { static void operator delete(void* ptr, std::size_t sz) { if(sz != sizeof(TestBase)){ - throw std::runtime_error("wrong object size"); + oatpp::base::Environment::log(2, "PerfTest::TestBase", "[ERROR|CRITICAL]: MemoryPool malfunction. Deleting object of wrong size"); \ } ::operator delete(ptr); }