Revert "Merge"

[mono.git] / mcs / mcs / membercache.cs

diff --git a/mcs/mcs/membercache.cs b/mcs/mcs/membercache.cs
index de1ef82c7fd610f50f3cce042a8d9897e2bfeac8..5da68dc735756cd4a7967f3ccb65a5eb04701cdd 100644 (file)
--- a/mcs/mcs/membercache.cs
+++ b/mcs/mcs/membercache.cs
@@ -795,13 +795,14 @@ namespace Mono.CSharp {
                        while (true) {
                                foreach (var entry in abstract_type.MemberCache.member_hash) {
                                        foreach (var name_entry in entry.Value) {
-                                               if ((name_entry.Modifiers & (Modifiers.ABSTRACT | Modifiers.OVERRIDE)) != Modifiers.ABSTRACT)
+                                               if ((name_entry.Modifiers & Modifiers.ABSTRACT) == 0)
                                                        continue;
 
-                                               if (name_entry.Kind != MemberKind.Method)
+                                               var ms = name_entry as MethodSpec;
+                                               if (ms == null)
                                                        continue;
 
-                                               abstract_methods.Add ((MethodSpec) name_entry);
+                                               abstract_methods.Add (ms);
                                        }
                                }