Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 10:59:49 +00:00
parent a569aebcfd
commit e79aa3c0ed
17047 changed files with 3137615 additions and 392334 deletions

View File

@ -1571,6 +1571,15 @@ namespace CorCompare
if (res != 0)
return res;
if (ma.HasGenericParameters != mb.HasGenericParameters)
return ma.HasGenericParameters ? -1 : 1;
if (ma.HasGenericParameters && mb.HasGenericParameters) {
res = ma.GenericParameters.Count - mb.GenericParameters.Count;
if (res != 0)
return res;
}
// operators can differ by only return type
return string.CompareOrdinal (ma.ReturnType.FullName, mb.ReturnType.FullName);
}