diff --git a/ChangeLog b/ChangeLog index e32feaaee..a7d087c27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,9 @@ 2010-06-26 Richard Frith-Macdonald - * Source/NSObject.m: Implement methods from the Object(NSObjectCompat) - category for NSZombie. This is a workaround for what seems to be an - objc runtime bug (that category is being added to NSZombie even though - NSZombie is not a subclass of Object). + * Source/NSObject.m: Remove the Object(NSObjectCompat) category as the + use ogf the Object class is *really* obsolete, and also there appears + to be an objc runtime bug whaich adds the category methods to NSZombie + even though NSZombie is not a subclass of Object. 2010-06-25 Richard Frith-Macdonald diff --git a/Source/NSObject.m b/Source/NSObject.m index d31059b95..b9eea0961 100644 --- a/Source/NSObject.m +++ b/Source/NSObject.m @@ -2361,61 +2361,6 @@ objc_create_block_classes_as_subclasses_of(Class super) __attribute__((weak)); @end -/* - * Stuff for compatibility with 'Object' derived classes. - */ -@interface Object (NSObjectCompat) -+ (NSString*) description; -+ (void) release; -+ (id) retain; -- (NSString*) className; -- (NSString*) description; -- (void) release; -- (BOOL) respondsToSelector: (SEL)aSel; -- (id) retain; -@end - -@implementation Object (NSObjectCompat) -+ (NSString*) description -{ - return NSStringFromClass(self); -} -+ (void) release -{ - return; -} -+ (id) retain -{ - return self; -} -- (NSString*) className -{ - return NSStringFromClass([self class]); -} -- (NSString*) description -{ - return [NSString stringWithFormat: @"<%s: %p>", - GSClassNameFromObject(self), self]; -} -- (BOOL) isProxy -{ - return NO; -} -- (void) release -{ - return; -} -- (BOOL) respondsToSelector: (SEL)aSelector -{ - /* Object implements -respondsTo: */ - return [self respondsTo: aSelector]; -} -- (id) retain -{ - return self; -} -@end - @implementation NSZombie @@ -2423,14 +2368,6 @@ objc_create_block_classes_as_subclasses_of(Class super) __attribute__((weak)); { return (Class)isa; } -- (void) dealloc -{ - GSLogZombie(self, _cmd); -} -- (void) description -{ - GSLogZombie(self, _cmd); -} - (Class) originalClass { return NSMapGet(zombieMap, (void*)self); @@ -2463,20 +2400,6 @@ objc_create_block_classes_as_subclasses_of(Class super) __attribute__((weak)); [allocationLock unlock]; return [c instanceMethodSignatureForSelector: aSelector]; } -- (void) release -{ - GSLogZombie(self, _cmd); -} -- (BOOL) respondsToSelector: (SEL)aSel -{ - GSLogZombie(self, _cmd); - return NO; -} -- (id) retain -{ - GSLogZombie(self, _cmd); - return self; -} @end @implementation GSContentAccessingProxy