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

@ -505,7 +505,8 @@ Console.WriteLine (" -> '{0}'", c.Replacement);
static bool IsIgnorable (int i, COpt opt)
{
return Uni.IsIgnorable (i, (byte) (1 +
return Uni.IsIgnorable (i, (byte)
(((opt & (COpt.Ordinal | COpt.OrdinalIgnoreCase)) == 0 ? 1 : 0) +
((opt & COpt.IgnoreSymbols) != 0 ? 2 : 0) +
((opt & COpt.IgnoreNonSpace) != 0 ? 4 : 0)));