Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -358,8 +358,10 @@ namespace System.Reflection.Emit {
return UnmanagedMarshal.DefineLPArrayInternal (subtype, sizeConst, sizeParamIndex);
else
return UnmanagedMarshal.DefineLPArray (subtype);
#if FEATURE_COMINTEROP
case UnmanagedType.SafeArray:
return UnmanagedMarshal.DefineSafeArray (subtype);
#endif
case UnmanagedType.ByValArray:
if (!is_field)
throw new ArgumentException ("Specified unmanaged type is only valid on fields");
@@ -367,8 +369,10 @@ namespace System.Reflection.Emit {
return UnmanagedMarshal.DefineByValArray (sizeConst);
case UnmanagedType.ByValTStr:
return UnmanagedMarshal.DefineByValTStr (sizeConst);
#if FEATURE_COMINTEROP
case UnmanagedType.CustomMarshaler:
return UnmanagedMarshal.DefineCustom (marshalTypeRef, marshalCookie, marshalTypeName, Guid.Empty);
#endif
default:
return UnmanagedMarshal.DefineUnmanagedMarshal ((UnmanagedType)utype);
}