2002-11-04 Dietmar Maurer <dietmar@ximian.com>

	* marshal.c (emit_ptr_to_str_conv): try to fix bug 29548

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index b8514c3f61251f72581586c5e9429614baa4a800..829b5b2db80de083ff63873f3256ed2a40dd61ce 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,6 @@
+2002-11-04  Dietmar Maurer  <dietmar@ximian.com>
+
+       * marshal.c (emit_ptr_to_str_conv): try to fix bug 29548
 
 Sun Nov 3 15:39:28 CET 2002 Paolo Molaro <lupus@ximian.com>
 

diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c
index 2dfab6af1ad3ef46b9229f7583bd9b669db87f40..91aaadf62e9a5c0868d8ef47c96483b8b03f6425 100644 (file)
--- a/mono/metadata/marshal.c
+++ b/mono/metadata/marshal.c
@@ -611,6 +611,11 @@ emit_ptr_to_str_conv (MonoMethodBuilder *mb, MonoType *type, MonoMarshalConv con
                mono_mb_emit_byte (mb, CEE_STLOC_1);
                break;
        }
+       case MONO_MARSHAL_CONV_DEL_FTN: {
+               // fixme: we never convert functions back to delegates, dont 
+               // know if thats the correct behaviour
+               break;
+       }
        case MONO_MARSHAL_CONV_STR_LPWSTR:
        case MONO_MARSHAL_CONV_STR_BSTR:
        case MONO_MARSHAL_CONV_STR_ANSIBSTR: