Merge pull request #4222 from alexanderkyte/fix_mismatch_com_disabled

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

diff --git a/mcs/class/corlib/System.Security.Permissions/GacIdentityPermission.cs b/mcs/class/corlib/System.Security.Permissions/GacIdentityPermission.cs
index 7604ef5a34db8b66455f40ac94224302daf79621..3ad3f369617b317ce75e449cf0351a0fa535bbfb 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/GacIdentityPermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/GacIdentityPermission.cs
@@ -1,5 +1,5 @@
 //
-// System.Security.Permissions.GacIdentityPermission
+// System.Security.Permissions.GacIdentityPermission.cs
 //
 // Author:
 //     Sebastien Pouliot  <sebastien@ximian.com>
@@ -26,13 +26,11 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
 using System.Globalization;
 using System.Runtime.InteropServices;
-\r
-namespace System.Security.Permissions {\r
-\r
+
+namespace System.Security.Permissions {
+
        [ComVisible (true)]
        [Serializable]
        public sealed class GacIdentityPermission : CodeAccessPermission, IBuiltInPermission {
@@ -75,10 +73,10 @@ namespace System.Security.Permissions {
                        return Copy ();
                }
 
-               public override void FromXml (SecurityElement esd)
+               public override void FromXml (SecurityElement securityElement)
                {
                        // General validation in CodeAccessPermission
-                       CheckSecurityElement (esd, "esd", version, version);
+                       CheckSecurityElement (securityElement, "securityElement", version, version);
                        // Note: we do not (yet) care about the return value 
                        // as we only accept version 1 (min/max values)
                }
@@ -113,4 +111,3 @@ namespace System.Security.Permissions {
        }
 }
 
-#endif