Imported Upstream version 4.6.0.182

Former-commit-id: 439c182e520038bf50777ca2fe684f216ae28552
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-09-01 10:46:18 +00:00
parent c911219690
commit 804b15604f
118 changed files with 1007 additions and 891 deletions

View File

@@ -645,10 +645,7 @@ namespace System.Runtime.InteropServices{
#endif
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface, Inherited = false)]
[System.Runtime.InteropServices.ComVisible(true)]
#if !MONOTOUCH
public
#endif
sealed class ComImportAttribute : Attribute
public sealed class ComImportAttribute : Attribute
{
internal static Attribute GetCustomAttribute(RuntimeType type)
{

View File

@@ -12,7 +12,7 @@
**
**
=============================================================================*/
#if !FULL_AOT_RUNTIME
namespace System.Runtime.InteropServices {
using System;
@@ -31,11 +31,15 @@ namespace System.Runtime.InteropServices {
{
if (obj != null)
{
#if FULL_AOT_RUNTIME
throw new PlatformNotSupportedException ();
#else
// Make sure this guy has an IDispatch
IntPtr pdisp = Marshal.GetIDispatchForObject(obj);
// If we got here without throwing an exception, the QI for IDispatch succeeded.
Marshal.Release(pdisp);
#endif
}
m_WrappedObject = obj;
}
@@ -51,4 +55,3 @@ namespace System.Runtime.InteropServices {
private Object m_WrappedObject;
}
}
#endif

View File

@@ -12,7 +12,7 @@
**
**
=============================================================================*/
#if !FULL_AOT_RUNTIME
namespace System.Runtime.InteropServices {
using System;
@@ -54,4 +54,3 @@ namespace System.Runtime.InteropServices {
private int m_ErrorCode;
}
}
#endif