X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fcustom-attrs.c;h=46c8ba4f1640831814a2583aed99009b32776a8a;hb=32fb6a33cb254b93a0f7ea9731480ffb605792d7;hp=8e56148ab1cb8fd8994f2233b11deb542b1df47d;hpb=22577feecfa38fc15a01887f27aa5687b0c5504c;p=mono.git

diff --git a/mono/metadata/custom-attrs.c b/mono/metadata/custom-attrs.c
index 8e56148ab1c..46c8ba4f164 100644
--- a/mono/metadata/custom-attrs.c
+++ b/mono/metadata/custom-attrs.c
@@ -16,7 +16,6 @@
 #include "mono/metadata/gc-internals.h"
 #include "mono/metadata/mono-endian.h"
 #include "mono/metadata/object-internals.h"
-#include "mono/metadata/reflection-cache.h"
 #include "mono/metadata/custom-attrs-internals.h"
 #include "mono/metadata/sre-internals.h"
 #include "mono/metadata/reflection-internals.h"
@@ -132,13 +131,14 @@ find_field_index (MonoClass *klass, MonoClassField *field) {
  * Find the property index in the metadata Property table.
  */
 static guint32
-find_property_index (MonoClass *klass, MonoProperty *property) {
+find_property_index (MonoClass *klass, MonoProperty *property)
+{
 	int i;
-	MonoClassExt *ext = mono_class_get_ext (klass);
+	MonoClassPropertyInfo *info = mono_class_get_property_info (klass);
 
-	for (i = 0; i < ext->property.count; ++i) {
-		if (property == &ext->properties [i])
-			return ext->property.first + 1 + i;
+	for (i = 0; i < info->count; ++i) {
+		if (property == &info->properties [i])
+			return info->first + 1 + i;
 	}
 	return 0;
 }
@@ -147,13 +147,14 @@ find_property_index (MonoClass *klass, MonoProperty *property) {
  * Find the event index in the metadata Event table.
  */
 static guint32
-find_event_index (MonoClass *klass, MonoEvent *event) {
+find_event_index (MonoClass *klass, MonoEvent *event)
+{
 	int i;
-	MonoClassExt *ext = mono_class_get_ext (klass);
+	MonoClassEventInfo *info = mono_class_get_event_info (klass);
 
-	for (i = 0; i < ext->event.count; ++i) {
-		if (event == &ext->events [i])
-			return ext->event.first + 1 + i;
+	for (i = 0; i < info->count; ++i) {
+		if (event == &info->events [i])
+			return info->first + 1 + i;
 	}
 	return 0;
 }