Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge from HEAD.

svn path=/branches/mono-1-1-11/mono/; revision=54443
  • Loading branch information...
commit b28e8eb77161f75a676f160365a860455db15476 1 parent 2b18ed7
@vargaz vargaz authored
Showing with 8 additions and 1 deletion.
  1. +4 −0 mono/metadata/ChangeLog
  2. +4 −1 mono/metadata/class.c
View
4 mono/metadata/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-15 Zoltan Varga <vargaz@gmail.com>
+
+ * class.c (mono_class_setup_vtable): Call mono_reflection_get_dynamic_overrides () for dynamic classes.
+
2005-12-14 Zoltan Varga <vargaz@gmail.com>
* loader.c (mono_loader_set_error_type_load): Print the type load
View
5 mono/metadata/class.c
@@ -1553,7 +1553,10 @@ mono_class_setup_vtable (MonoClass *class)
else
context = (MonoGenericContext *) class->generic_container;
- mono_class_get_overrides_full (class->image, class->type_token, &overrides, &onum, context);
+ if (class->image->dynamic)
+ mono_reflection_get_dynamic_overrides (class, &overrides, &onum);
+ else
+ mono_class_get_overrides_full (class->image, class->type_token, &overrides, &onum, context);
mono_class_setup_vtable_general (class, overrides, onum);
g_free (overrides);
Please sign in to comment.
Something went wrong with that request. Please try again.