projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
30c02ef
)
[mono-api-info] Take return type into account when comparing methods.
author
Rolf Bjarne Kvinge
<rolf@xamarin.com>
Thu, 19 Nov 2015 09:23:03 +0000
(10:23 +0100)
committer
Rolf Bjarne Kvinge
<rolf@xamarin.com>
Thu, 19 Nov 2015 09:28:38 +0000
(10:28 +0100)
mcs/tools/corcompare/mono-api-info.cs
patch
|
blob
|
history
diff --git
a/mcs/tools/corcompare/mono-api-info.cs
b/mcs/tools/corcompare/mono-api-info.cs
index 42f28d979c2e3b449a78b473b365c1c92420327b..6194bb30ef7fffa23e3c392db8b745b5654f2b09 100644
(file)
--- a/
mcs/tools/corcompare/mono-api-info.cs
+++ b/
mcs/tools/corcompare/mono-api-info.cs
@@
-1439,7
+1439,12
@@
namespace CorCompare
if (!mb.HasParameters)
return 1;
- return Compare (ma.Parameters, mb.Parameters);
+ res = Compare (ma.Parameters, mb.Parameters);
+ if (res != 0)
+ return res;
+
+ // operators can differ by only return type
+ return string.CompareOrdinal (ma.ReturnType.FullName, mb.ReturnType.FullName);
}
public static int Compare (IList<ParameterDefinition> pia, IList<ParameterDefinition> pib)