From: Ziemowit Laski <zlaski@apple.com>
Date: Fri, 5 Mar 2004 21:06:57 +0000 (+0000)
Subject: hash.h (hash_string, [...]): Add type-casts to make Objective-C++ happy.
X-Git-Tag: releases/gcc-4.0.0~9596
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5e63fce337455aab205430400bc8794560198e8;p=thirdparty%2Fgcc.git

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 5aca4bc5e8af..37300f06e95c 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 02aca6e8765a..4c545315acfd 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 ed78bf76a78d..48456a6381d1 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);
 
 
 /*