projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[System] Rename method parameters to match .NET contract
[mono.git]
/
mcs
/
class
/
System
/
System.Security.Permissions
/
StorePermission.cs
diff --git
a/mcs/class/System/System.Security.Permissions/StorePermission.cs
b/mcs/class/System/System.Security.Permissions/StorePermission.cs
index 239e65ce8a3a85ac2be94e53d6fbb3ecf1c3d61a..62ae915ca3b7fce7c748b192fa2367417df3e974 100644
(file)
--- a/
mcs/class/System/System.Security.Permissions/StorePermission.cs
+++ b/
mcs/class/System/System.Security.Permissions/StorePermission.cs
@@
-26,8
+26,6
@@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
-
using System.Globalization;
namespace System.Security.Permissions {
using System.Globalization;
namespace System.Security.Permissions {
@@
-48,10
+46,10
@@
namespace System.Security.Permissions {
_flags = StorePermissionFlags.NoFlags;
}
_flags = StorePermissionFlags.NoFlags;
}
- public StorePermission (StorePermissionFlags flag
s
)
+ public StorePermission (StorePermissionFlags flag)
{
// reuse validation by the Flags property
{
// reuse validation by the Flags property
- Flags = flag
s
;
+ Flags = flag;
}
}
@@
-131,14
+129,14
@@
namespace System.Security.Permissions {
return ((_flags & ~dp._flags) == 0);
}
return ((_flags & ~dp._flags) == 0);
}
- public override void FromXml (SecurityElement
e
)
+ public override void FromXml (SecurityElement
securityElement
)
{
// General validation in CodeAccessPermission
{
// General validation in CodeAccessPermission
- PermissionHelper.CheckSecurityElement (
e, "e
", version, version);
+ PermissionHelper.CheckSecurityElement (
securityElement, "securityElement
", version, version);
// Note: we do not (yet) care about the return value
// as we only accept version 1 (min/max values)
// Note: we do not (yet) care about the return value
// as we only accept version 1 (min/max values)
- string s =
e
.Attribute ("Flags");
+ string s =
securityElement
.Attribute ("Flags");
if (s == null)
_flags = StorePermissionFlags.NoFlags;
else
if (s == null)
_flags = StorePermissionFlags.NoFlags;
else
@@
-173,4
+171,3
@@
namespace System.Security.Permissions {
}
}
}
}
-#endif