Merge pull request #3622 from rolfbjarne/remove-stray-file

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

diff --git a/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermission.cs b/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermission.cs
index 46a6d38773e379814106081b280a414fb6baf58b..d4450eb3ec7318056df36babfdc68bf603dc043b 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermission.cs
@@ -35,9 +35,7 @@ namespace System.Security.Permissions {
 
        [Serializable]
        [SecurityPermission (SecurityAction.InheritanceDemand, ControlEvidence = true, ControlPolicy = true)]
-#if NET_2_0
        [ComVisible (true)]
-#endif
        public abstract class IsolatedStoragePermission : CodeAccessPermission, IUnrestrictedPermission {
 
                private const int version = 1;
@@ -48,11 +46,7 @@ namespace System.Security.Permissions {
                internal bool m_permanentData;
                internal IsolatedStorageContainment m_allowed;
 
-#if NET_2_0
                protected IsolatedStoragePermission (PermissionState state)
-#else
-               public IsolatedStoragePermission (PermissionState state)
-#endif
                {
                        if (CheckPermissionState (state, true) == PermissionState.Unrestricted) {
                                UsageAllowed = IsolatedStorageContainment.UnrestrictedIsolatedStorage;
@@ -125,8 +119,7 @@ namespace System.Security.Permissions {
                                }
                                a = esd.Attribute ("UserQuota");
                                if (a != null) {
-                                       Exception exc;
-                                       Int64.Parse (a, true, out m_userQuota, out exc);
+                                       m_userQuota = Int64.Parse (a, CultureInfo.InvariantCulture);
                                }
                        }
                }