diff options
| author | zlaski <zlaski@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-03-05 21:06:57 +0000 |
|---|---|---|
| committer | zlaski <zlaski@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-03-05 21:06:57 +0000 |
| commit | 85a9f75f3a31ef62843bdddf891b3082744f0195 (patch) | |
| tree | 0178e5ab1f603a42eae35feb51265a55c335bb17 /libobjc | |
| parent | ebdab8b6d9a7c02c35b31543fb9de25d3f8a35d3 (diff) | |
| download | gcc-85a9f75f3a31ef62843bdddf891b3082744f0195.tar.gz | |
2004-03-05 Ziemowit Laski <zlaski@apple.com>
* objc/hash.h (hash_string, compare_strings):
Add type-casts to make Objective-C++ happy.
* objc/typedstream.h (objc_get_stream_class_version):
Rename parameter from 'class' to 'class_name' to make
Objective-C++ happy.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@78986 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libobjc')
| -rw-r--r-- | libobjc/ChangeLog | 8 | ||||
| -rw-r--r-- | libobjc/objc/hash.h | 4 | ||||
| -rw-r--r-- | libobjc/objc/typedstream.h | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 5aca4bc5e8a..37300f06e95 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,11 @@ +2004-03-05 Ziemowit Laski <zlaski@apple.com> + + * objc/hash.h (hash_string, compare_strings): + Add type-casts to make Objective-C++ happy. + * objc/typedstream.h (objc_get_stream_class_version): + Rename parameter from 'class' to 'class_name' to make + Objective-C++ happy. + 2004-03-01 Michael Matz <matz@suse.de> * Makefile.in (ALL_CFLAGS): Add -fno-strict-aliasing. diff --git a/libobjc/objc/hash.h b/libobjc/objc/hash.h index 02aca6e8765..4c545315acf 100644 --- a/libobjc/objc/hash.h +++ b/libobjc/objc/hash.h @@ -172,7 +172,7 @@ hash_string (cache_ptr cache, const void *key) { unsigned int ret = 0; unsigned int ctr = 0; - const char *ckey = key; + const char *ckey = (const char *) key; while (*ckey) { ret ^= *ckey++ << ctr; @@ -200,7 +200,7 @@ compare_strings (const void *k1, const void *k2) else if (k1 == 0 || k2 == 0) return 0; else - return ! strcmp (k1, k2); + return ! strcmp ((const char *) k1, (const char *) k2); } diff --git a/libobjc/objc/typedstream.h b/libobjc/objc/typedstream.h index ed78bf76a78..48456a6381d 100644 --- a/libobjc/objc/typedstream.h +++ b/libobjc/objc/typedstream.h @@ -99,7 +99,7 @@ int objc_read_types (TypedStream* stream, const char* type, ...); int objc_write_object_reference (TypedStream* stream, id object); int objc_write_root_object (TypedStream* stream, id object); -long objc_get_stream_class_version (TypedStream* stream, Class class); +long objc_get_stream_class_version (TypedStream* stream, Class class_type); /* |