2002-02-14 Jeffrey Stedfast <fejj@ximian.com>

	* image.c (load_class_names): Cast the second argument to
	g_hash_table_insert() to char* to hush compiler warnings about the
	arg being a const.
	(mono_image_open): Same here.

svn path=/trunk/mono/; revision=2416

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 009684dcfd05654a21a1066c1c3013134eb6ee94..4a0db90f815600a99bc699d1623cac4e377974b4 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,5 +1,10 @@
 2002-02-14  Jeffrey Stedfast  <fejj@ximian.com>
 
+       * image.c (load_class_names): Cast the second argument to
+       g_hash_table_insert() to char* to hush compiler warnings about the
+       arg being a const.
+       (mono_image_open): Same here.
+
        * socket-io.c: Don't conditionally include sys/filio.h or
        sys/sockio.h here anymore since we now get them from
        io-layer/io-layer.h

diff --git a/mono/metadata/image.c b/mono/metadata/image.c
index d42904506b5b8ce0918dde1083ba711d983e3c7d..a3d227d097dd36827a9fcf3f5c7119340965bd53 100644 (file)
--- a/mono/metadata/image.c
+++ b/mono/metadata/image.c
@@ -349,10 +349,11 @@ load_metadata (MonoImage *image, MonoCLIImageInfo *iinfo)
 }
 
 static void
-load_class_names (MonoImage *image) {
+load_class_names (MonoImage *image)
+{
        MonoTableInfo  *t = &image->tables [MONO_TABLE_TYPEDEF];
        guint32 cols [MONO_TYPEDEF_SIZE];
-       const char* name;
+       const char *name;
        const char *nspace;
        GHashTable *nspace_table;
        GHashTable *name_cache = image->name_cache;
@@ -368,9 +369,9 @@ load_class_names (MonoImage *image) {
                nspace = mono_metadata_string_heap (image, cols [MONO_TYPEDEF_NAMESPACE]);
                if (!(nspace_table = g_hash_table_lookup (name_cache, nspace))) {
                        nspace_table = g_hash_table_new (g_str_hash, g_str_equal);
-                       g_hash_table_insert (name_cache, nspace, nspace_table);
+                       g_hash_table_insert (name_cache, (char *) nspace, nspace_table);
                }
-               g_hash_table_insert (nspace_table, name, GUINT_TO_POINTER (i));
+               g_hash_table_insert (nspace_table, (char *) name, GUINT_TO_POINTER (i));
        }
 }
 
@@ -565,8 +566,8 @@ mono_image_open (const char *fname, enum MonoImageOpenStatus *status)
        if (!loaded_images_hash)
                loaded_images_hash = g_hash_table_new (g_str_hash, g_str_equal);
        g_hash_table_insert (loaded_images_hash, image->name, image);
-       g_hash_table_insert (loaded_images_hash, image->assembly_name, image);
-
+       g_hash_table_insert (loaded_images_hash, (char *) image->assembly_name, image);
+       
        return image;
 }