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

Imported Upstream version 6.0.0.172

Browse Source 
Former-commit-id: f3cc9b82f3e5bd8f0fd3ebc098f789556b44e9cd
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-04-12 14:10:50 +00:00
parent 8016999e4d
commit 64ac736ec5
32155 changed files with 3981439 additions and 75368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,8 +47,6 @@ namespace System
public bool curried_first_arg;
}
[ClassInterface (ClassInterfaceType.AutoDual)]
[System.Runtime.InteropServices.ComVisible (true)]
[Serializable]
[StructLayout (LayoutKind.Sequential)]
public abstract class Delegate : ICloneable, ISerializable
@@ -352,7 +350,7 @@ namespace System
for (Type targetType = target; targetType != null; targetType = targetType.BaseType) {
MethodInfo mi = targetType.GetMethod (method, flags,
null, delargtypes, EmptyArray<ParameterModifier>.Value);
null, delargtypes, Array.Empty<ParameterModifier>());
if (mi != null && return_type_match (invoke.ReturnType, mi.ReturnType)) {
info = mi;
break;
@@ -515,7 +513,7 @@ namespace System
} else {
if (method != IntPtr.Zero) {
if (!method_is_virtual)
method_info = (MethodInfo)MethodBase.GetMethodFromHandleNoGenericCheck (new RuntimeMethodHandle (method));
method_info = (MethodInfo)RuntimeMethodInfo.GetMethodFromHandleNoGenericCheck (new RuntimeMethodHandle (method));
else
method_info = GetVirtualMethod_internal ();
}
@@ -547,7 +545,7 @@ namespace System
return a;
if (a.GetType () != b.GetType ())
throw new ArgumentException (Locale.GetText ("Incompatible Delegate Types. First is {0} second is {1}.", a.GetType ().FullName, b.GetType ().FullName));
throw new ArgumentException (string.Format ("Incompatible Delegate Types. First is {0} second is {1}.", a.GetType ().FullName, b.GetType ().FullName));
return a.CombineImpl (b);
}
@@ -584,7 +582,7 @@ namespace System
return source;
if (source.GetType () != value.GetType ())
throw new ArgumentException (Locale.GetText ("Incompatible Delegate Types. First is {0} second is {1}.", source.GetType ().FullName, value.GetType ().FullName));
throw new ArgumentException (string.Format ("Incompatible Delegate Types. First is {0} second is {1}.", source.GetType ().FullName, value.GetType ().FullName));
return source.RemoveImpl (value);
}