@@ -28,11 +28,10 @@ #import "OFBlock.h" #import "OFAllocFailedException.h" #import "OFInitializationFailedException.h" -#import "OFNotImplementedException.h" #import "macros.h" #ifdef OF_ATOMIC_OPS # import "atomic.h" #endif @@ -387,52 +386,57 @@ } #endif + alloc { - @throw [OFNotImplementedException exceptionWithClass: self - selector: _cmd]; + [self doesNotRecognizeSelector: _cmd]; + abort(); } - init { - @throw [OFNotImplementedException exceptionWithClass: [self class] - selector: _cmd]; + @try { + [self doesNotRecognizeSelector: _cmd]; + abort(); + } @catch (id e) { + [self release]; + @throw e; + } } - (void*)allocMemoryWithSize: (size_t)size { - @throw [OFNotImplementedException exceptionWithClass: [self class] - selector: _cmd]; + [self doesNotRecognizeSelector: _cmd]; + abort(); } - (void*)allocMemoryWithSize: (size_t)size count: (size_t)count { - @throw [OFNotImplementedException exceptionWithClass: [self class] - selector: _cmd]; + [self doesNotRecognizeSelector: _cmd]; + abort(); } - (void*)resizeMemory: (void*)ptr size: (size_t)size { - @throw [OFNotImplementedException exceptionWithClass: [self class] - selector: _cmd]; + [self doesNotRecognizeSelector: _cmd]; + abort(); } - (void*)resizeMemory: (void*)ptr size: (size_t)size count: (size_t)count { - @throw [OFNotImplementedException exceptionWithClass: [self class] - selector: _cmd]; + [self doesNotRecognizeSelector: _cmd]; + abort(); } - (void)freeMemory: (void*)ptr { - @throw [OFNotImplementedException exceptionWithClass: [self class] - selector: _cmd]; + [self doesNotRecognizeSelector: _cmd]; + abort(); } - retain { if (object_getClass(self) == (Class)&_NSConcreteMallocBlock) @@ -469,10 +473,12 @@ Block_release(self); } - (void)dealloc { - @throw [OFNotImplementedException exceptionWithClass: [self class] - selector: _cmd]; - [super dealloc]; /* Get rid of a stupid warning */ + [self doesNotRecognizeSelector: _cmd]; + abort(); + + /* Get rid of a stupid warning */ + [super dealloc]; } @end