2005-06-28 Miguel de Icaza <miguel@novell.com>

	* pending.cs: Do not define a proxy if the base method is virtual,
	it will be picked up by the runtime (bug 75270).

svn path=/trunk/mcs/; revision=46682

diff --git a/mcs/gmcs/ChangeLog b/mcs/gmcs/ChangeLog
index 1068add0113386e2df666228db958d5b8ad2ecd3..82581a072941f6389d58f831ee54f2f907966392 100644 (file)
--- a/mcs/gmcs/ChangeLog
+++ b/mcs/gmcs/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-28  Miguel de Icaza  <miguel@novell.com>
+
+       * pending.cs: Do not define a proxy if the base method is virtual,
+       it will be picked up by the runtime (bug 75270).
+
 2005-06-28  Martin Baulig  <martin@ximian.com>
 
        * cs-parser.jay (interface_method_declaration): Avoid a

diff --git a/mcs/gmcs/pending.cs b/mcs/gmcs/pending.cs
index 3c17b53a99c641a6f9db86284ab643de5777d48e..3891b10e856c9ef64fa2a558bd2c6def0fffc5e1 100644 (file)
--- a/mcs/gmcs/pending.cs
+++ b/mcs/gmcs/pending.cs
@@ -542,7 +542,7 @@ namespace Mono.CSharp {
                        //
                        MethodInfo base_method = (MethodInfo) list [0];
 
-                       if (!base_method.IsAbstract)
+                       if (!base_method.IsAbstract && !base_method.IsVirtual)
                                DefineProxy (iface_type, base_method, mi, args);
                        return true;
                }