Merge pull request dotnet/corert#4340 from dotnet/nmirror

jkotas · jkotas · commit 367d9b1dd1b5 · 2017-08-17T21:42:32.000-07:00
Merge nmirror to master

Signed-off-by: dotnet-bot &lt;dotnet-bot@microsoft.com&gt;
diff --git a/src/mscorlib/shared/System/Reflection/Pointer.cs b/src/mscorlib/shared/System/Reflection/Pointer.cs
@@ -46,6 +46,6 @@ void ISerializable.GetObjectData(SerializationInfo info, StreamingContext contex
         }
 
         internal Type GetPointerType() => _ptrType;
-        internal object GetPointerValue() => (IntPtr)_ptr;
+        internal IntPtr GetPointerValue() => (IntPtr)_ptr;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,6 @@ void ISerializable.GetObjectData(SerializationInfo info, StreamingContext contex`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`internal Type GetPointerType() => _ptrType;`
`49`		`- internal object GetPointerValue() => (IntPtr)_ptr;`
	`49`	`+ internal IntPtr GetPointerValue() => (IntPtr)_ptr;`
`50`	`50`	`}`
`51`	`51`	`}`