1
0

Fixed bad merge

This commit is contained in:
Tycho
2014-05-25 18:26:10 +01:00
parent 8133efd7f9
commit 2a7d199df6
3 changed files with 17 additions and 10 deletions

View File

@@ -8,8 +8,14 @@ int main(int argc, char** argv)
{
class cStarvationCallbacks
: public cAllocationPool<cChunkData::sChunkSection,1600>::cStarvationCallbacks
{
virtual void OnStartingUsingBuffer() {}
virtual void OnStopUsingBuffer() {}
virtual void OnBufferEmpty() {}
};
cAllocationPool<cChunkData::sChunkSection,1600> Pool(std::auto_ptr<cAllocationPool<cChunkData::sChunkSection,1600>::cStarvationCallbacks>(new cStarvationCallbacks()));
{
cChunkData buffer;
cChunkData buffer(Pool);
// Empty chunks
buffer.SetBlock(0, 0, 0, 0xAB);