summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kotas <jkotas@microsoft.com>2016-06-17 21:03:23 -0700
committerGitHub <noreply@github.com>2016-06-17 21:03:23 -0700
commit0e5f844e008b3a9ea537a0dfcb84f51f8b79e60b (patch)
tree4eaa868cb2784c73ec847593b6893e009f9e5e13
parent22788578877f3a4741f4448eb06ae14687870e03 (diff)
parent8f606f32391ee12babe38a91b3501cc31019f94b (diff)
downloadcoreclr-0e5f844e008b3a9ea537a0dfcb84f51f8b79e60b.tar.gz
coreclr-0e5f844e008b3a9ea537a0dfcb84f51f8b79e60b.tar.bz2
coreclr-0e5f844e008b3a9ea537a0dfcb84f51f8b79e60b.zip
Merge pull request #5858 from dotnet-bot/from-tfs
Merge changes from TFS
-rw-r--r--src/mscorlib/src/System/Threading/Volatile.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mscorlib/src/System/Threading/Volatile.cs b/src/mscorlib/src/System/Threading/Volatile.cs
index 1a069b4c69..19207c610d 100644
--- a/src/mscorlib/src/System/Threading/Volatile.cs
+++ b/src/mscorlib/src/System/Threading/Volatile.cs
@@ -129,6 +129,7 @@ namespace System.Threading
[ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
[CLSCompliant(false)]
[System.Runtime.Versioning.NonVersionable]
+ [SecuritySafeCritical] // to match 32-bit version
public static ulong Read(ref ulong location)
{
//
@@ -331,6 +332,7 @@ namespace System.Threading
[ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
[CLSCompliant(false)]
[System.Runtime.Versioning.NonVersionable]
+ [SecuritySafeCritical] // to match 32-bit version
public static void Write(ref ulong location, ulong value)
{
//