Author: zoltan
Date: 2007-03-06 11:07:19 -0500 (Tue, 06 Mar 2007)
New Revision: 73818
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/metadata.c
Log:
2007-03-06 Zoltan Varga <[EMAIL PROTECTED]>
* metadata.c (mono_type_to_unmanaged): Only convert object to
MARSHAL_CONV_SAFEHANDLE on the 2.0 profile.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2007-03-06 15:33:54 UTC (rev 73817)
+++ trunk/mono/mono/metadata/ChangeLog 2007-03-06 16:07:19 UTC (rev 73818)
@@ -1,4 +1,8 @@
+2007-03-06 Zoltan Varga <[EMAIL PROTECTED]>
+ * metadata.c (mono_type_to_unmanaged): Only convert object to
+ MARSHAL_CONV_SAFEHANDLE on the 2.0 profile.
+
Tue Mar 6 15:39:48 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>
* class-internals.h, class.c, metadata.c, reflection.c: removed unused
Modified: trunk/mono/mono/metadata/metadata.c
===================================================================
--- trunk/mono/mono/metadata/metadata.c 2007-03-06 15:33:54 UTC (rev 73817)
+++ trunk/mono/mono/metadata/metadata.c 2007-03-06 16:07:19 UTC (rev 73818)
@@ -4282,7 +4282,7 @@
*conv = MONO_MARSHAL_CONV_DEL_FTN;
return MONO_NATIVE_FUNC;
}
- if (type->data.klass == mono_defaults.safehandle_class){
+ if (mono_defaults.safehandle_class && type->data.klass ==
mono_defaults.safehandle_class){
*conv = MONO_MARSHAL_CONV_SAFEHANDLE;
return MONO_NATIVE_INT;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
