mirror/oatpp
2
0
Fork 0
mirror of https://github.com/oatpp/oatpp.git synced 2025-04-06 18:40:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

removed throw in memory pool delete

Browse Source
This commit is contained in:
lganzzzo 2018-06-07 00:45:58 +03:00
parent 9826028b9a
commit b8a8d41c4f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/base/memory/ObjectPool.hpp
View File

@ -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); \
} \

2
test/core/base/memory/PerfTest.cpp
View File

@ -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);
}