diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2005-12-15 14:01:35 +0300 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2005-12-15 14:01:35 +0300 |
| commit | b28e8eb77161f75a676f160365a860455db15476 (patch) | |
| tree | 314e858610b942d05556195e4d2bae7291908749 | |
| parent | 2b18ed7e05bb64d13582f5996f2a7d7c926ad2bb (diff) | |
Merge from HEAD.mono-1.1.11mono-1-1-11
svn path=/branches/mono-1-1-11/mono/; revision=54443
| -rw-r--r-- | mono/metadata/ChangeLog | 4 | ||||
| -rw-r--r-- | mono/metadata/class.c | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index e434a23ab2f..a2e8a7c3c61 100644 --- a/mono/metadata/ChangeLog +++ b/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 diff --git a/mono/metadata/class.c b/mono/metadata/class.c index 6ebab87f3cc..8d01a4f9b35 100644 --- a/mono/metadata/class.c +++ b/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); |