Merge pull request #5198 from BrzVlad/fix-binprot-stats

[mono.git] / mcs / class / corlib / System.Security.Permissions / PrincipalPermission.cs

diff --git a/mcs/class/corlib/System.Security.Permissions/PrincipalPermission.cs b/mcs/class/corlib/System.Security.Permissions/PrincipalPermission.cs
index e340d0a325972d7b7e1378712876a6df44bef29f..5052eef0b07e37cbdbfb7a7131c5931c07377970 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/PrincipalPermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/PrincipalPermission.cs
@@ -34,9 +34,7 @@ using System.Threading;
 
 namespace System.Security.Permissions {
 
-#if NET_2_0
        [ComVisible (true)]
-#endif
        [Serializable]
        public sealed class PrincipalPermission : IPermission, IUnrestrictedPermission, IBuiltInPermission {
 
@@ -132,17 +130,17 @@ namespace System.Security.Permissions {
                        }
                }
 
-               public void FromXml (SecurityElement esd) 
+               public void FromXml (SecurityElement elem) 
                {
                        // General validation in CodeAccessPermission
-                       CheckSecurityElement (esd, "esd", version, version);
+                       CheckSecurityElement (elem, "elem", version, version);
                        // Note: we do not (yet) care about the return value 
                        // as we only accept version 1 (min/max values)
 
                        principals.Clear ();
                        // Children is null, not empty, when no child is present
-                       if (esd.Children != null) {
-                               foreach (SecurityElement se in esd.Children) {
+                       if (elem.Children != null) {
+                               foreach (SecurityElement se in elem.Children) {
                                        if (se.Tag != "Identity")
                                                throw new ArgumentException ("not IPermission/Identity");
                                        string name = se.Attribute ("ID");
@@ -258,9 +256,9 @@ namespace System.Security.Permissions {
                        return se;
                }
 
-               public IPermission Union (IPermission target)
+               public IPermission Union (IPermission other)
                {
-                       PrincipalPermission pp = Cast (target);
+                       PrincipalPermission pp = Cast (other);
                        if (pp == null)
                                return Copy ();
 
@@ -274,7 +272,6 @@ namespace System.Security.Permissions {
                        return union;
                }
 
-#if NET_2_0
                [ComVisible (false)]
                public override bool Equals (object obj)
                {
@@ -313,7 +310,6 @@ namespace System.Security.Permissions {
                {
                        return base.GetHashCode ();
                }
-#endif
 
                // IBuiltInPermission
                int IBuiltInPermission.GetTokenIndex ()