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

Imported Upstream version 5.14.0.78

Browse Source 
Former-commit-id: 3494343bcc9ddb42b36b82dd9ae7b69e85e0229f
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-05-10 08:37:03 +00:00
parent 74b74abd9f
commit 19234507ba
1776 changed files with 67755 additions and 31107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mcs/class/corlib/ReferenceSources/CompareInfo.cs
View File

@ -64,9 +64,9 @@ namespace System.Globalization
}
lock (collators) {
if (!collators.TryGetValue (m_sortName, out collator)) {
if (!collators.TryGetValue (_sortName, out collator)) {
collator = new SimpleCollator (CultureInfo.GetCultureInfo (m_name));
collators [m_sortName] = collator;
collators [_sortName] = collator;
}
}
@ -88,20 +88,11 @@ namespace System.Globalization
return(key);
}
int internal_index_switch (string s, int sindex, int count, char c, CompareOptions opt, bool first)
{
if (opt == CompareOptions.Ordinal && first)
return s.IndexOfUnchecked (c, sindex, count);
return UseManagedCollation ?
internal_index_managed (s, sindex, count, c, opt, first) :
internal_index (s, sindex, count, c, opt, first);
}
int internal_index_switch (string s1, int sindex, int count, string s2, CompareOptions opt, bool first)
{
if (opt == CompareOptions.Ordinal && first)
return s1.IndexOfUnchecked (s2, sindex, count);
// TODO: should not be needed, why is there specialization for OrdinalIgnore and not for Ordinal
if (opt == CompareOptions.Ordinal)
return first ? s1.IndexOfUnchecked (s2, sindex, count) : s1.LastIndexOfUnchecked (s2, sindex, count);
return UseManagedCollation ?
internal_index_managed (s1, sindex, count, s2, opt, first) :