diff options
| author | Sebastien Pouliot <sebastien@ximian.com> | 2005-10-30 17:52:14 +0300 |
|---|---|---|
| committer | Sebastien Pouliot <sebastien@ximian.com> | 2005-10-30 17:52:14 +0300 |
| commit | 0d441b69b21df71468afeae0d8ed6a7ac8eaaf86 (patch) | |
| tree | 4c68a4e501db9d390d1732cc6934802791d47227 /mcs/class/corlib/System.Security/PermissionSet.cs | |
| parent | 593afc18fe40654016cffa7aa470cb01dd7d159e (diff) | |
2005-10-30 Sebastien Pouliot <sebastien@ximian.com>
* PermissionSet.cs: Forgot to remove virtual from 2.0 IsSubsetOf.
svn path=/trunk/mcs/; revision=52392
Diffstat (limited to 'mcs/class/corlib/System.Security/PermissionSet.cs')
| -rw-r--r-- | mcs/class/corlib/System.Security/PermissionSet.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mcs/class/corlib/System.Security/PermissionSet.cs b/mcs/class/corlib/System.Security/PermissionSet.cs index 35b91f57f6f..132150c07a0 100644 --- a/mcs/class/corlib/System.Security/PermissionSet.cs +++ b/mcs/class/corlib/System.Security/PermissionSet.cs @@ -354,9 +354,9 @@ namespace System.Security { return list.GetEnumerator (); } - public virtual bool IsSubsetOf (PermissionSet target) - { #if NET_2_0 + public bool IsSubsetOf (PermissionSet target) + { // if target is empty we must be empty too if ((target == null) || (target.IsEmpty ())) return this.IsEmpty (); @@ -366,6 +366,9 @@ namespace System.Security { return true; if (this.IsUnrestricted ()) return false; +#else + public virtual bool IsSubsetOf (PermissionSet target) + { #endif if (this.IsUnrestricted () && ((target == null) || !target.IsUnrestricted ())) return false; |