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

changed code for old compilers

Browse Source
This commit is contained in:
hyung-hwan
2015-03-24 09:34:57 +00:00
parent 7706db354e
commit 1c1d9b4158
12 changed files with 108 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,11 @@ void* operator new (qse_size_t size, QSE::Mmgr* mmgr)
return mmgr->allocate (size);
}
#if defined(QSE_CPP_NO_OPERATOR_DELETE_OVERLOADING)
void qse_operator_delete (void* ptr, QSE::Mmgr* mmgr)
#else
void operator delete (void* ptr, QSE::Mmgr* mmgr)
#endif
{
mmgr->dispose (ptr);
}

13
qse/lib/cmn/Mpool.cpp
View File

@ -196,21 +196,26 @@ void* operator new (qse_size_t size, QSE::Mpool* mp)
// is never reached.
goto use_mmgr;
}
return mp->allocate ();
return mp->allocate();
}
else
{
use_mmgr:
// when the memory pool is not enabled, it goes through
// the memory manager directly and it honors the size argument.
return ::operator new(size, mp->getMmgr());
//return ::operator new(size, mp->getMmgr());
return mp->getMmgr()->allocate(size);
}
}
#if defined(QSE_CPP_NO_OPERATOR_DELETE_OVERLOADING)
void qse_operator_delete (void* ptr, QSE::Mpool* mp)
#else
void operator delete (void* ptr, QSE::Mpool* mp)
#endif
{
if (mp->isEnabled()) mp->dispose (ptr);
else ::operator delete (ptr, mp->getMmgr());
if (mp->isEnabled()) mp->dispose(ptr);
else mp->getMmgr()->dispose(ptr);
}
void* operator new (qse_size_t size, QSE::Mpool* mp, void* existing_ptr)