Author: zoltan
Date: 2008-01-23 14:52:56 -0500 (Wed, 23 Jan 2008)
New Revision: 93698

Modified:
   trunk/mono/mono/metadata/ChangeLog
   trunk/mono/mono/metadata/class.c
Log:
2008-01-23  Zoltan Varga  <[EMAIL PROTECTED]>

        * class.c (mono_class_inflate_generic_method_full): Change the
        struct assignments to memcpy for better visibility and add some 
comments.


Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog  2008-01-23 19:47:46 UTC (rev 93697)
+++ trunk/mono/mono/metadata/ChangeLog  2008-01-23 19:52:56 UTC (rev 93698)
@@ -1,3 +1,8 @@
+2008-01-23  Zoltan Varga  <[EMAIL PROTECTED]>
+
+       * class.c (mono_class_inflate_generic_method_full): Change the
+       struct assignments to memcpy for better visibility and add some 
comments.
+
 2008-01-23  Dick Porter  <[EMAIL PROTECTED]>
 
        * threads.c (mono_threads_set_shutting_down): Simplify shutdown

Modified: trunk/mono/mono/metadata/class.c
===================================================================
--- trunk/mono/mono/metadata/class.c    2008-01-23 19:47:46 UTC (rev 93697)
+++ trunk/mono/mono/metadata/class.c    2008-01-23 19:52:56 UTC (rev 93698)
@@ -665,9 +665,9 @@
 
        sig = mono_method_signature (method);
        if (sig->pinvoke) {
-               iresult->method.pinvoke = *(MonoMethodPInvoke*)method;
+               memcpy (&iresult->method.pinvoke, method, sizeof 
(MonoMethodPInvoke));
        } else {
-               iresult->method.normal = *(MonoMethodNormal*)method;
+               memcpy (&iresult->method.normal, method, sizeof 
(MonoMethodNormal));
                iresult->method.normal.header = NULL;
        }
 
@@ -691,6 +691,7 @@
                        mono_metadata_free_type (inflated);
        }
 
+       /* These are originally set by the memcpy above */
        if (context->method_inst)
                result->generic_container = NULL;
        else if (method->generic_container)

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

Reply via email to