* mcs/flowanalysis.cs (UsageVector.MergeOrigins): Reorganize.

[mono.git] / mcs / gmcs / pending.cs

diff --git a/mcs/gmcs/pending.cs b/mcs/gmcs/pending.cs
index afbfd561875fc501121b0e5d30c88f5ac148c244..79c0fb5e24f3469ef33c96939545ae16571cee89 100644 (file)
--- a/mcs/gmcs/pending.cs
+++ b/mcs/gmcs/pending.cs
@@ -179,7 +179,7 @@ namespace Mono.CSharp {
                                
                                int j = 0;
                                foreach (MethodInfo m in mi){
-                                       pending_implementations [i].args [j] = TypeManager.NoTypes;
+                                       pending_implementations [i].args [j] = Type.EmptyTypes;
                                        pending_implementations [i].mods [j] = null;
 
                                        // If there is a previous error, just ignore
@@ -551,6 +551,9 @@ namespace Mono.CSharp {
                        //
                        MethodInfo base_method = (MethodInfo) list [0];
 
+                       if (base_method.DeclaringType.IsInterface)
+                               return false;
+
                        if (!base_method.IsAbstract && !base_method.IsVirtual)
                                DefineProxy (iface_type, base_method, mi, args);