From: Alexander Köplinger Date: Sat, 30 Sep 2017 19:51:42 +0000 (+0200) Subject: [corlib] Make Marshal.BufferToBSTR(Array, int) non-public again (#5670) X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mono.git;a=commitdiff_plain;h=813c1308fe53d16b419d22777f4d1124f06e7c9e [corlib] Make Marshal.BufferToBSTR(Array, int) non-public again (#5670) * [corlib] Make Marshal.BufferToBSTR(Array, int) non-public again It was accidentally made public in https://github.com/mono/mono/commit/c5cdfaec1e0973ced3f97ef589cd0bece56067ad. Unfortunately this was before we had the API diff check on Mono and the manual checks in XI/XA integration didn't catch it either. * Bump API snapshot submodule --- diff --git a/external/api-snapshot b/external/api-snapshot index 090c95d755f..627333cae84 160000 --- a/external/api-snapshot +++ b/external/api-snapshot @@ -1 +1 @@ -Subproject commit 090c95d755f8112db5cf6c30df92a9941d9124a4 +Subproject commit 627333cae84f02a36ee9ca605c96dac4557d9f35 diff --git a/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs b/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs index 128b8c983b1..e94898a5c38 100644 --- a/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs +++ b/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs @@ -1239,7 +1239,7 @@ namespace System.Runtime.InteropServices [MethodImplAttribute(MethodImplOptions.InternalCall)] - public extern static IntPtr BufferToBSTR (Array ptr, int slen); + extern static IntPtr BufferToBSTR (Array ptr, int slen); [MethodImplAttribute(MethodImplOptions.InternalCall)] public extern static IntPtr UnsafeAddrOfPinnedArrayElement (Array arr, int index);