Author: zoltan
Date: 2008-02-06 08:44:23 -0500 (Wed, 06 Feb 2008)
New Revision: 95023

Modified:
   trunk/mono/mono/metadata/ChangeLog
   trunk/mono/mono/metadata/marshal.c
Log:
2008-02-06  Zoltan Varga  <[EMAIL PROTECTED]>

        * marshal.c (mono_marshal_get_runtime_invoke): Revert the direct_wrapper
        changes for now since they seem to break too many things.


Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog  2008-02-06 13:39:08 UTC (rev 95022)
+++ trunk/mono/mono/metadata/ChangeLog  2008-02-06 13:44:23 UTC (rev 95023)
@@ -1,3 +1,8 @@
+2008-02-06  Zoltan Varga  <[EMAIL PROTECTED]>
+
+       * marshal.c (mono_marshal_get_runtime_invoke): Revert the direct_wrapper
+       changes for now since they seem to break too many things.
+
 2008-02-05  Mark Probst  <[EMAIL PROTECTED]>
 
        * marshal.c, marshal.h (mono_marshal_find_bitfield_offset,

Modified: trunk/mono/mono/metadata/marshal.c
===================================================================
--- trunk/mono/mono/metadata/marshal.c  2008-02-06 13:39:08 UTC (rev 95022)
+++ trunk/mono/mono/metadata/marshal.c  2008-02-06 13:44:23 UTC (rev 95023)
@@ -4629,8 +4629,12 @@
                        callsig = finalize_signature;
                        target_klass = mono_defaults.object_class;
                } else {
+                       // FIXME: This breaks too many things
+                       /*
                        if (mono_class_get_cctor (method->klass))
                                need_direct_wrapper = TRUE;
+                       */
+
                        /*
                         * Can't put these wrappers into object, since they 
reference non-corlib
                         * metadata (callsig).

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to