Remove patch that *did* regress the build, it was even flagged on Bugzilla

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

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 1554a4d4a0388c0115993f1517952918902232e3..ab2abe3e37eeaabfd4e0eb9efd70e2076348c0e3 100755 (executable)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -152,6 +152,16 @@
        * ecore.cs (Expression.MemberLookupFailed): Added CS1540 check for
        classes.        
 
+2004-04-28  Martin Baulig  <martin@ximian.com>
+
+       Committing a patch from Ben Maurer; see bug #50820.
+
+       * typemanager.cs (TypeManager.FilterWithClosure): Added CS1540
+       check for classes.
+
+       * ecore.cs (Expression.MemberLookupFailed): Added CS1540 check for
+       classes.        
+
 2004-04-28  Martin Baulig  <martin@ximian.com>
 
        * statement.cs (Block.LookupLabel): Also lookup in implicit child blocks.

diff --git a/mcs/mcs/ecore.cs b/mcs/mcs/ecore.cs
index 36aed96482d62861811c8c3d5e1843ea054aa71d..1af5f7dad2b10b11b10380611d7e0ce9dc0af877 100755 (executable)
--- a/mcs/mcs/ecore.cs
+++ b/mcs/mcs/ecore.cs
@@ -647,7 +647,7 @@ namespace Mono.CSharp {
                        }
 
                        if ((qualifier_type != null) && (qualifier_type != ec.ContainerType) &&
-                           !qualifier_type.IsSubclassOf (ec.ContainerType)) {
+                           ec.ContainerType.IsSubclassOf (qualifier_type)) {
                                // Although a derived class can access protected members of
                                // its base class it cannot do so through an instance of the
                                // base class (CS1540).  If the qualifier_type is a parent of the

diff --git a/mcs/mcs/typemanager.cs b/mcs/mcs/typemanager.cs
index 5a62e3a911166b52afc2e2156c793239243c2319..2aaf24097d00cd14d546717f684d9f8e8d3d2bca 100755 (executable)
--- a/mcs/mcs/typemanager.cs
+++ b/mcs/mcs/typemanager.cs
@@ -2519,7 +2519,7 @@ public class TypeManager {
                                // it cannot do so through an instance of the base class (CS1540).
                                if (!mb.IsStatic && (closure_invocation_type != closure_qualifier_type) &&
                                    (closure_qualifier_type != null) &&
-                                   ! closure_qualifier_type.IsSubclassOf (closure_invocation_type) &&
+                                   closure_invocation_type.IsSubclassOf (closure_qualifier_type) &&
                                    !TypeManager.IsNestedChildOf (closure_invocation_type, closure_qualifier_type))
                                        return false;