Commit d5e63fce by Ziemowit Laski Committed by Ziemowit Laski

hash.h (hash_string, [...]): Add type-casts to make Objective-C++ happy.

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.

From-SVN: r78986
parent c18b95e5
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> 2004-03-01 Michael Matz <matz@suse.de>
* Makefile.in (ALL_CFLAGS): Add -fno-strict-aliasing. * Makefile.in (ALL_CFLAGS): Add -fno-strict-aliasing.
......
...@@ -172,7 +172,7 @@ hash_string (cache_ptr cache, const void *key) ...@@ -172,7 +172,7 @@ hash_string (cache_ptr cache, const void *key)
{ {
unsigned int ret = 0; unsigned int ret = 0;
unsigned int ctr = 0; unsigned int ctr = 0;
const char *ckey = key; const char *ckey = (const char *) key;
while (*ckey) { while (*ckey) {
ret ^= *ckey++ << ctr; ret ^= *ckey++ << ctr;
...@@ -200,7 +200,7 @@ compare_strings (const void *k1, const void *k2) ...@@ -200,7 +200,7 @@ compare_strings (const void *k1, const void *k2)
else if (k1 == 0 || k2 == 0) else if (k1 == 0 || k2 == 0)
return 0; return 0;
else else
return ! strcmp (k1, k2); return ! strcmp ((const char *) k1, (const char *) k2);
} }
......
...@@ -99,7 +99,7 @@ int objc_read_types (TypedStream* stream, const char* type, ...); ...@@ -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_object_reference (TypedStream* stream, id object);
int objc_write_root_object (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);
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment