X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fmono-hash.c;h=075c62f129bbd06f19442241c2ee0777aca36c8b;hb=a1af4392231c64d6a50a72f0518dd52369d46915;hp=bbfa757212bd7706345bf9b4de0851d14af76cc8;hpb=1076f878926aad85bd919e684caeeeb6d44a1cc1;p=mono.git diff --git a/mono/metadata/mono-hash.c b/mono/metadata/mono-hash.c index bbfa757212b..075c62f129b 100644 --- a/mono/metadata/mono-hash.c +++ b/mono/metadata/mono-hash.c @@ -32,6 +32,7 @@ #include "mono-hash.h" #include "metadata/gc-internals.h" #include +#include #ifdef HAVE_BOEHM_GC #define mg_new0(type,n) ((type *) GC_MALLOC(sizeof(type) * (n))) @@ -173,7 +174,7 @@ typedef struct { static void* do_rehash (void *_data) { - RehashData *data = _data; + RehashData *data = (RehashData *)_data; MonoGHashTable *hash = data->hash; int current_size, i; Slot **table; @@ -425,17 +426,17 @@ mono_g_hash_table_insert_replace (MonoGHashTable *hash, gpointer key, gpointer v if (replace){ if (hash->key_destroy_func != NULL) (*hash->key_destroy_func)(s->key); - s->key = key; + s->key = (MonoObject *)key; } if (hash->value_destroy_func != NULL) (*hash->value_destroy_func) (s->value); - s->value = value; + s->value = (MonoObject *)value; return; } } s = new_slot (hash); - s->key = key; - s->value = value; + s->key = (MonoObject *)key; + s->value = (MonoObject *)value; s->next = hash->table [hashcode]; hash->table [hashcode] = s; hash->in_use++;