git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Object.m (compare): Add type id. 

2008-06-10  Kai Tietz  <kai.tietz@onevision.com>

	* Object.m (compare): Add type id.
	* objc/Object.h: Likewise.
	* archive.c (objc_read_class): Use size_t to extend version to be
	size of pointer scalar width.
	* sendmsg.c (rtx): Undefine it before redefinition.
	(__objc_print_dtable_stats): Cast arguments to long as intended.

From-SVN: r136617
This commit is contained in:
Kai Tietz 2008-06-10 12:37:51 +00:00 committed by Kai Tietz
parent 33ee581000
commit c24aadf3fa
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libobjc/ChangeLog
View File

@ -1,3 +1,12 @@
2008-06-10 Kai Tietz <kai.tietz@onevision.com>
* Object.m (compare): Add type id.
* objc/Object.h: Likewise.
* archive.c (objc_read_class): Use size_t to extend version to be
size of pointer scalar width.
* sendmsg.c (rtx): Undefine it before redefinition.
(__objc_print_dtable_stats): Cast arguments to long as intended.
2008-05-30 Julian Brown <julian@codesourcery.com> 2008-05-30 Julian Brown <julian@codesourcery.com>
* exception.c (__objc_exception_class): Initialise as constant * exception.c (__objc_exception_class): Initialise as constant

2
libobjc/Object.m
View File

@ -115,7 +115,7 @@ extern int errno;
return self==anObject; return self==anObject;
} }
- (int)compare:anotherObject; - (int)compare:(id)anotherObject;
{ {
if ([self isEqual:anotherObject]) if ([self isEqual:anotherObject])
return 0; return 0;

2
libobjc/archive.c
View File

@ -908,7 +908,7 @@ objc_read_class (struct objc_typed_stream *stream, Class *class)
objc_read_unsigned_long (stream, &version); objc_read_unsigned_long (stream, &version);
objc_hash_add (&stream->class_table, objc_hash_add (&stream->class_table,
(*class)->name, (void *)version); (*class)->name, (void *) ((size_t) version));
} }
else if ((buf[0]&_B_CODE) == _B_UCOMM) else if ((buf[0]&_B_CODE) == _B_UCOMM)

2
libobjc/objc/Object.h
View File

@ -66,7 +66,7 @@ extern "C" {
- self; - self;
- (unsigned int)hash; - (unsigned int)hash;
- (BOOL)isEqual:anObject; - (BOOL)isEqual:anObject;
- (int)compare:anotherObject; - (int)compare:(id)anotherObject;
/* Testing object type */ /* Testing object type */
- (BOOL)isMetaClass; - (BOOL)isMetaClass;

8
libobjc/sendmsg.c
View File

@ -41,6 +41,8 @@ Boston, MA 02110-1301, USA. */
#define gen_rtx(args...) 1 #define gen_rtx(args...) 1
#define gen_rtx_MEM(args...) 1 #define gen_rtx_MEM(args...) 1
#define gen_rtx_REG(args...) 1 #define gen_rtx_REG(args...) 1
/* Alread defined in gcc/coretypes.h. So prevent double definition warning. */
#undef rtx
#define rtx int #define rtx int
#if ! defined (STRUCT_VALUE) || STRUCT_VALUE == 0 #if ! defined (STRUCT_VALUE) || STRUCT_VALUE == 0
@ -685,14 +687,14 @@ __objc_print_dtable_stats ()
#endif #endif
printf ("arrays: %d = %ld bytes\n", narrays, printf ("arrays: %d = %ld bytes\n", narrays,
(long) narrays * sizeof (struct sarray)); (long) (narrays * sizeof (struct sarray)));
total += narrays * sizeof (struct sarray); total += narrays * sizeof (struct sarray);
printf ("buckets: %d = %ld bytes\n", nbuckets, printf ("buckets: %d = %ld bytes\n", nbuckets,
(long) nbuckets * sizeof (struct sbucket)); (long) (nbuckets * sizeof (struct sbucket)));
total += nbuckets * sizeof (struct sbucket); total += nbuckets * sizeof (struct sbucket);
printf ("idxtables: %d = %ld bytes\n", printf ("idxtables: %d = %ld bytes\n",
idxsize, (long) idxsize * sizeof (void *)); idxsize, (long) (idxsize * sizeof (void *)));
total += idxsize * sizeof (void *); total += idxsize * sizeof (void *);
printf ("-----------------------------------\n"); printf ("-----------------------------------\n");
printf ("total: %d bytes\n", total); printf ("total: %d bytes\n", total);