Mercurial > mm7
diff Allocator.cpp @ 720:05f7a11f4f20
Слияние
author | Ritor1 |
---|---|
date | Tue, 19 Mar 2013 23:41:29 +0600 |
parents | e39702f35283 |
children | c59ac5ea63f5 |
line wrap: on
line diff
--- a/Allocator.cpp Tue Mar 19 23:41:14 2013 +0600 +++ b/Allocator.cpp Tue Mar 19 23:41:29 2013 +0600 @@ -21,6 +21,9 @@ //----- (00426755) -------------------------------------------------------- void *Allocator::AllocNamedChunk(const void *pPrevPtrValue, unsigned int uSize, const char *pName) { + + return malloc(uSize); +/* //Allocator *v4; // esi@1 unsigned int v5; // eax@7 void *result; // eax@8 @@ -83,7 +86,7 @@ uNextFreeOffsetInBigBuffer += aligned_size; } return pMemoryBuffers[uNumBuffersUsed]; - + */ /* //v4 = this; if ( pPrevPtrValue && !aborting_app ) @@ -181,7 +184,9 @@ //----- (00426474) -------------------------------------------------------- void Allocator::FreeChunk(void *ptr) { - Allocator *v2; // esi@1 + free(ptr); + return; +/* Allocator *v2; // esi@1 unsigned int v3; // eax@5 signed int i; // edi@5 unsigned int v5; // eax@13 @@ -201,8 +206,8 @@ for (indx = 0; indx <=uNumBuffersUsed; ++indx) if (pMemoryBuffers[indx] == ptr) break; - if ((indx>uNumBuffersUsed)&& !aborting_app ) - AbortWithError(); //to detect memory problems - uncomment + //if ((indx>uNumBuffersUsed)&& !aborting_app ) + //AbortWithError(); //to detect memory problems - uncomment if (!bUseBigBuffer) free(pMemoryBuffers[indx]); pMemoryBuffers[indx] = NULL; @@ -230,7 +235,7 @@ } } } - + */ /* v2 = this; if ( ptr )