hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed the code to call the destructor when dispoing an object with mmgr

Browse Source
This commit is contained in:
hyung-hwan
2018-07-01 07:33:56 +00:00
parent 87e0cf1b40
commit 9cbd6cd7fe
8 changed files with 43 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
qse/lib/cmn/Mmgr.cpp
View File

@ -47,9 +47,9 @@ void Mmgr::free_mem (mmgr_t* mmgr, void* ptr) QSE_CPP_NOEXCEPT
((Mmgr*)mmgr->ctx)->freeMem (ptr);
}
void* Mmgr::callocate (qse_size_t n, bool raise_exception)
void* Mmgr::callocate (qse_size_t n, bool raise_exception) throw(MemoryError)
{
void* ptr = this->allocate (n, raise_exception);
void* ptr = this->allocate(n, raise_exception);
QSE_MEMSET (ptr, 0, n);
return ptr;
}
@ -70,7 +70,7 @@ void Mmgr::setDFL (Mmgr* mmgr) QSE_CPP_NOEXCEPT
QSE_END_NAMESPACE(QSE)
/////////////////////////////////
void* operator new (qse_size_t size, QSE::Mmgr* mmgr)
void* operator new (qse_size_t size, QSE::Mmgr* mmgr) throw(QSE::Mmgr::MemoryError)
{
return mmgr->allocate (size);
}
@ -84,7 +84,7 @@ void operator delete (void* ptr, QSE::Mmgr* mmgr)
mmgr->dispose (ptr);
}
void* operator new (qse_size_t size, QSE::Mmgr* mmgr, void* existing_ptr)
void* operator new (qse_size_t size, QSE::Mmgr* mmgr, void* existing_ptr) throw(QSE::Mmgr::MemoryError)
{
// mmgr unused. i put it in the parameter list to make this function
// less conflicting with the stock ::operator new() that doesn't allocate.