gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 16:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed [NSObject +conformsToProtocol:] and [NSObject -conformsToProtocol:]

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@31769 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nicola 2010-12-24 15:37:06 +00:00
parent b84001b073
commit fb481f5fc8
2 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2010-12-24 Nicola Pero <nicola.pero@meta-innovation.com>
* Source/NSObject.m ([+conformsToProtocol:]): Fixed to iterate
over superclasses. Just calling class_conformsToProtcol() is not
enough as class_conformsToProtocol() does not iterate over
superclasses.
([-conformsToProtocol:]): Updated.
2010-12-23 Nicola Pero <nicola.pero@meta-innovation.com> 2010-12-23 Nicola Pero <nicola.pero@meta-innovation.com>
* configure.ac: Check for objc_setUncaughtExceptionHandler(). * configure.ac: Check for objc_setUncaughtExceptionHandler().

15
Source/NSObject.m
View file

@ -1298,7 +1298,18 @@ objc_create_block_classes_as_subclasses_of(Class super) __attribute__((weak));
*/ */
+ (BOOL) conformsToProtocol: (Protocol*)aProtocol + (BOOL) conformsToProtocol: (Protocol*)aProtocol
{ {
return class_conformsToProtocol(self, aProtocol); Class c;
/* Iterate over the current class and all the superclasses. */
for (c = self; c != Nil; c = class_getSuperclass (c))
{
if (class_conformsToProtocol(c, aProtocol))
{
return YES;
}
}
return NO;
} }
/** /**
@ -1307,7 +1318,7 @@ objc_create_block_classes_as_subclasses_of(Class super) __attribute__((weak));
*/ */
- (BOOL) conformsToProtocol: (Protocol*)aProtocol - (BOOL) conformsToProtocol: (Protocol*)aProtocol
{ {
return class_conformsToProtocol([self class], aProtocol); return [[self class] conformsToProtocol: aProtocol];
} }
/** /**