diff options
| author | Ben Maurer <benm@mono-cvs.ximian.com> | 2005-02-03 02:10:05 +0300 |
|---|---|---|
| committer | Ben Maurer <benm@mono-cvs.ximian.com> | 2005-02-03 02:10:05 +0300 |
| commit | f0cc7b722514f9a66636fbdc2ba46d2ad09290da (patch) | |
| tree | 9293e31ab7ad9b7d97a1f2deb49a2341f9542823 | |
| parent | 95073f7dd20bdfd60914ee0e71bb6c666ef7ff4a (diff) | |
2005-02-02 Ben Maurer <bmaurer@ximian.com>mono-1.1.4
* reflection.c, appdomain.c: Replace a few manual searches that
Zoltan missed. (Paolo approved this part of my initial patch).
svn path=/trunk/mono/; revision=40013
| -rw-r--r-- | mono/metadata/ChangeLog | 4 | ||||
| -rw-r--r-- | mono/metadata/appdomain.c | 7 | ||||
| -rw-r--r-- | mono/metadata/reflection.c | 13 |
3 files changed, 17 insertions, 7 deletions
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index cfcfae989be..ec5ed1f3ed9 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +1,7 @@ +2005-02-02 Ben Maurer <bmaurer@ximian.com> + + * reflection.c, appdomain.c: Replace a few manual searches that + Zoltan missed. (Paolo approved this part of my initial patch). Wed Feb 2 16:32:08 CET 2005 Paolo Molaro <lupus@ximian.com> diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c index 60a9bcbfb93..ccb7d85bbea 100644 --- a/mono/metadata/appdomain.c +++ b/mono/metadata/appdomain.c @@ -213,12 +213,7 @@ mono_domain_has_type_resolve (MonoDomain *domain) MonoObject *o; if (field == NULL) { - MonoClass *klass = mono_defaults.appdomain_class; - int i; - - for (i = 0; i < klass->field.count; ++i) - if (strcmp (klass->fields [i].name, "TypeResolve") == 0) - field = &klass->fields [i]; + field = mono_class_get_field_from_name (mono_defaults.appdomain_class, "TypeResolve"); g_assert (field); } diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c index 607924dd205..1b7b605cb34 100644 --- a/mono/metadata/reflection.c +++ b/mono/metadata/reflection.c @@ -1949,7 +1949,18 @@ encode_new_constraint (MonoDynamicImage *assembly, guint32 owner) g_assert (NewConstraintAttr); if (!NewConstraintAttr_ctor) { - NewConstraintAttr_ctor = mono_class_get_method_from_name (NewConstraintAttr, ".ctor", -1); + int i; + + for (i = 0; i < NewConstraintAttr->method.count; i++) { + MonoMethod *m = NewConstraintAttr->methods [i]; + + if (strcmp (m->name, ".ctor")) + continue; + + NewConstraintAttr_ctor = m; + break; + } + g_assert (NewConstraintAttr_ctor); } |