diff options
| author | nicola <nicola@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-07-16 11:36:24 +0000 |
|---|---|---|
| committer | nicola <nicola@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-07-16 11:36:24 +0000 |
| commit | af5fe68cb583388d1e1b4f6b080841d49fb83441 (patch) | |
| tree | 82c52c6ed0882d8ec7d413daed169fa41665c57f /libobjc | |
| parent | 8729bf80a609bbab8bad8d82e4b71f1ab25071fe (diff) | |
Fixed object_is_class and object_is_metaclass
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44039 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libobjc')
| -rw-r--r-- | libobjc/ChangeLog | 7 | ||||
| -rw-r--r-- | libobjc/objc/objc-api.h | 16 |
2 files changed, 16 insertions, 7 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 6cde604ed48..da205a15df0 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,10 @@ +Mon Jul 16 12:15:00 2001 Nicola Pero <n.pero@mi.flashnet.it> + + * objc/objc-api.h (object_is_class): Fixed - buggy code was trying + to cast an id to a Class, which can not be done. Make the check + by using CLS_ISMETA on the class pointer instead. + (object_is_meta_class): Similar fix. + 2001-06-09 Alexandre Oliva <aoliva@redhat.com>, Stephen L Moshier <moshier@mediaone.net> * configure.in (AC_EXEEXT): Work around in case it expands to diff --git a/libobjc/objc/objc-api.h b/libobjc/objc/objc-api.h index d3e22f2088d..d0e3bb7fefb 100644 --- a/libobjc/objc/objc-api.h +++ b/libobjc/objc/objc-api.h @@ -578,21 +578,23 @@ object_get_super_class } static inline BOOL -object_is_class(id object) +object_is_class (id object) { - return CLS_ISCLASS((Class)object); + return ((object != nil) && CLS_ISMETA (object->class_pointer)); } - + static inline BOOL -object_is_instance(id object) +object_is_instance (id object) { - return (object!=nil)&&CLS_ISCLASS(object->class_pointer); + return ((object != nil) && CLS_ISCLASS (object->class_pointer)); } static inline BOOL -object_is_meta_class(id object) +object_is_meta_class (id object) { - return CLS_ISMETA((Class)object); + return ((object != nil) + && !object_is_instance (object) + && !object_is_class (object)); } struct sarray* |