diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2017-06-07 20:16:48 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2017-06-08 06:03:28 -0700 |
| commit | 688b470713c81b03abfe0aa388122d553f424f7b (patch) | |
| tree | 30d1c50805f387c7ab58c968a4754b02edead9a5 /src/mscorlib | |
| parent | 65ff5146ad706a9393133df44ad2abdfd5caa9c4 (diff) | |
| download | coreclr-688b470713c81b03abfe0aa388122d553f424f7b.tar.gz coreclr-688b470713c81b03abfe0aa388122d553f424f7b.tar.bz2 coreclr-688b470713c81b03abfe0aa388122d553f424f7b.zip | |
Merge pull request dotnet/corert#3832 from dotnet/nmirror
Merge nmirror to master
Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
Diffstat (limited to 'src/mscorlib')
| -rw-r--r-- | src/mscorlib/shared/System/Diagnostics/Tracing/EventSource.cs | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/mscorlib/shared/System/Diagnostics/Tracing/EventSource.cs b/src/mscorlib/shared/System/Diagnostics/Tracing/EventSource.cs index a30231b2f0..901c0c4f25 100644 --- a/src/mscorlib/shared/System/Diagnostics/Tracing/EventSource.cs +++ b/src/mscorlib/shared/System/Diagnostics/Tracing/EventSource.cs @@ -1134,17 +1134,7 @@ namespace System.Diagnostics.Tracing /// Address where the one argument lives (if this points to managed memory you must ensure the /// managed object is pinned. /// </summary> -#if PROJECTN // Workaround for DevDiv #445798 - public unsafe IntPtr DataPointer - { - [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)] - get { return (IntPtr)(void*)m_Ptr; } - [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)] - set { m_Ptr = unchecked((ulong)(void*)value); } - } -#else public unsafe IntPtr DataPointer { get { return (IntPtr)(void*)m_Ptr; } set { m_Ptr = unchecked((ulong)(void*)value); } } -#endif /// <summary> /// Size of the argument referenced by DataPointer |