@@ -20,25 +20,26 @@ if ((self = [super init]) != nil) __mem_pool = NULL; return self; } -- (void*)getMem: (size_t)size +- (void*)getMemWithSize: (size_t)size { struct __ofobject_allocated_mem *iter; if ((iter = malloc(sizeof(struct __ofobject_allocated_mem))) == NULL) { - [OFNoMemException newWithObject: self + [[OFNoMemException newWithObject: self andSize: sizeof(struct - __ofobject_allocated_mem)]; + __ofobject_allocated_mem) + ] raise]; return NULL; } if ((iter->ptr = malloc(size)) == NULL) { free(iter); - [OFNoMemException newWithObject: self - andSize: size]; + [[OFNoMemException newWithObject: self + andSize: size] raise]; return NULL; } iter->next = NULL; iter->prev = __mem_pool; @@ -57,22 +58,22 @@ struct __ofobject_allocated_mem *iter; for (iter = __mem_pool; iter != NULL; iter = iter->prev) { if (iter->ptr == ptr) { if ((ptr = realloc(iter->ptr, size)) == NULL) { - [OFNoMemException newWithObject: self - andSize: size]; + [[OFNoMemException newWithObject: self + andSize: size] raise]; return NULL; } iter->ptr = ptr; return ptr; } } - [OFMemNotPartOfObjException newWithObject: self - andPointer: ptr]; + [[OFMemNotPartOfObjException newWithObject: self + andPointer: ptr] raise]; return NULL; } - (void)freeMem: (void*)ptr; { @@ -92,12 +93,12 @@ return; } } - [OFMemNotPartOfObjException newWithObject: self - andPointer: ptr]; + [[OFMemNotPartOfObjException newWithObject: self + andPointer: ptr] raise]; } - free { struct __ofobject_allocated_mem *iter, *iter2;