mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.2.0.179

Browse Source 
Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mcs/class/corlib/System/Delegate.cs
View File

@@ -123,9 +123,6 @@ namespace System
[MethodImplAttribute (MethodImplOptions.InternalCall)]
internal static extern Delegate CreateDelegate_internal (Type type, object target, MethodInfo info, bool throwOnBindFailure);
[MethodImplAttribute (MethodImplOptions.InternalCall)]
internal extern void SetMulticastInvoke ();
private static bool arg_type_match (Type delArgType, Type argType) {
bool match = delArgType == argType;
@@ -186,11 +183,12 @@ namespace System
MethodInfo invoke = type.GetMethod ("Invoke");
if (!return_type_match (invoke.ReturnType, method.ReturnType))
if (!return_type_match (invoke.ReturnType, method.ReturnType)) {
if (throwOnBindFailure)
throw new ArgumentException ("method return type is incompatible");
else
return null;
}
ParameterInfo[] delargs = invoke.GetParametersInternal ();
ParameterInfo[] args = method.GetParametersInternal ();
@@ -224,11 +222,12 @@ namespace System
argLengthMatch = args.Length == delargs.Length + 1;
}
}
if (!argLengthMatch)
if (!argLengthMatch) {
if (throwOnBindFailure)
throw new ArgumentException ("method argument length mismatch");
else
return null;
}
bool argsMatch;
DelegateData delegate_data = new DelegateData ();
@@ -274,11 +273,12 @@ namespace System
}
}
if (!argsMatch)
if (!argsMatch) {
if (throwOnBindFailure)
throw new ArgumentException ("method arguments are incompatible");
else
return null;
}
Delegate d = CreateDelegate_internal (type, target, method, throwOnBindFailure);
if (d != null)
@@ -609,5 +609,14 @@ namespace System
return RemotingServices.IsTransparentProxy (m_target);
#endif
}
internal static Delegate CreateDelegateNoSecurityCheck (RuntimeType type, Object firstArgument, MethodInfo method)
{
return CreateDelegate_internal (type, firstArgument, method, true);
}
/* Internal call largely inspired from MS Delegate.InternalAllocLike */
[MethodImplAttribute(MethodImplOptions.InternalCall)]
internal extern static MulticastDelegate AllocDelegateLike_internal (Delegate d);
}
}