projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3381 from krytarowski/netbsd-support-20
[mono.git]
/
mcs
/
class
/
corlib
/
System
/
Delegate.cs
diff --git
a/mcs/class/corlib/System/Delegate.cs
b/mcs/class/corlib/System/Delegate.cs
index 6900c420bff44087199bfd5286c1e4d0415c9575..4064ed9c90185ac0eec46c390977a61b4340a0f9 100644
(file)
--- a/
mcs/class/corlib/System/Delegate.cs
+++ b/
mcs/class/corlib/System/Delegate.cs
@@
-534,6
+534,12
@@
namespace System
if (a == null)
return b;
if (a == null)
return b;
+ 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);
}
return a.CombineImpl (b);
}