diff options
| author | Rama krishnan Raghupathy <ramarag@microsoft.com> | 2016-10-25 22:47:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-25 22:47:27 -0700 |
| commit | 14a139d05e1e53552e991ddec915026c022c8071 (patch) | |
| tree | b29fc93f91066241da20bd45108970e8b22f61c6 | |
| parent | 5bf1e383b0ac0fda70c96ec7365dc1395606f44c (diff) | |
| parent | ec6103ab15fd9e4eaca5d0156f6cbba75efaa9ab (diff) | |
| download | coreclr-14a139d05e1e53552e991ddec915026c022c8071.tar.gz coreclr-14a139d05e1e53552e991ddec915026c022c8071.tar.bz2 coreclr-14a139d05e1e53552e991ddec915026c022c8071.zip | |
Merge pull request #7816 from ramarag/ThreadingOverlapped
Adding missing members of threading.overlapped
| -rw-r--r-- | src/mscorlib/model.xml | 4 | ||||
| -rw-r--r-- | src/mscorlib/src/System/Threading/ThreadPool.cs | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/mscorlib/model.xml b/src/mscorlib/model.xml index c29ed9378b..63d048b017 100644 --- a/src/mscorlib/model.xml +++ b/src/mscorlib/model.xml @@ -8087,6 +8087,7 @@ <Member Name="QueueUserWorkItem(System.Threading.WaitCallback)" /> <Member Name="QueueUserWorkItem(System.Threading.WaitCallback,System.Object)" /> <Member Name="SetMaxThreads(System.Int32,System.Int32)" /> + <Member Name="BindHandle(System.IntPtr)" /> <Member Name="BindHandle(System.Runtime.InteropServices.SafeHandle)" /> <Member Name="RegisterWaitForSingleObject(System.Threading.WaitHandle,System.Threading.WaitOrTimerCallback,System.Object,System.UInt32,System.Boolean)" /> <Member Name="RegisterWaitForSingleObject(System.Threading.WaitHandle,System.Threading.WaitOrTimerCallback,System.Object,System.Int32,System.Boolean)" /> @@ -8131,11 +8132,14 @@ <Member Name="#ctor(System.Int32,System.Int32,System.IntPtr,System.IAsyncResult)" /> <Member MemberType="Property" Name="AsyncResult" /> <Member MemberType="Property" Name="EventHandle" /> + <Member MemberType="Property" Name="EventHandleIntPtr" /> <Member MemberType="Property" Name="OffsetLow" /> <Member MemberType="Property" Name="OffsetHigh" /> <Member Name="Free(System.Threading.NativeOverlapped*)" /> + <Member Name="Pack(System.Threading.IOCompletionCallback)" /> <Member Name="Pack(System.Threading.IOCompletionCallback,System.Object)" /> <Member Name="Unpack(System.Threading.NativeOverlapped*)" /> + <Member Name="UnsafePack(System.Threading.IOCompletionCallback)" /> <Member Name="UnsafePack(System.Threading.IOCompletionCallback,System.Object)" Condition="FEATURE_COMINTEROP" /> </Type> <Type Name="System.Threading.IOCompletionCallback"> diff --git a/src/mscorlib/src/System/Threading/ThreadPool.cs b/src/mscorlib/src/System/Threading/ThreadPool.cs index 13fb144184..8262757c59 100644 --- a/src/mscorlib/src/System/Threading/ThreadPool.cs +++ b/src/mscorlib/src/System/Threading/ThreadPool.cs @@ -1904,17 +1904,18 @@ namespace System.Threading bool compressStack ); -#if !FEATURE_CORECLR + [System.Security.SecuritySafeCritical] // auto-generated [Obsolete("ThreadPool.BindHandle(IntPtr) has been deprecated. Please use ThreadPool.BindHandle(SafeHandle) instead.", false)] +#pragma warning disable 618 [SecurityPermissionAttribute( SecurityAction.Demand, Flags = SecurityPermissionFlag.UnmanagedCode)] +#pragma warning restore 618 public static bool BindHandle( IntPtr osHandle ) { return BindIOCompletionCallbackNative(osHandle); } -#endif #if FEATURE_CORECLR [System.Security.SecurityCritical] // auto-generated |