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

diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index 5aca4bc5e8af87b5d9aefa99610a0ee2b20b6bd8..37300f06e95c115a38eab0243aed64a85a0638c1 100644 (file)
--- 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 02aca6e8765a1a4ba349540106f1a807f690da0e..4c545315acfdb8404d27c791e511ed0bd3d5a5d2 100644 (file)
--- 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 ed78bf76a78de13283b2a5f1ae5f070069799487..48456a6381d13a2769cd902066c7f1495c6c42a1 100644 (file)
--- 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);
 
 
 /*