Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@@ -524,17 +524,9 @@ namespace System
/// </symmary>
public static Delegate Combine (Delegate a, Delegate b)
{
if (a == null) {
if (b == null)
return null;
if (a == null)
return b;
} else
if (b == null)
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));
return a.CombineImpl (b);
}