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

@@ -1001,7 +1001,7 @@ namespace MonoTests.Mono.Unix {
Assert.AreEqual (end.Length, bytes.Length, prefix + ": byte length");
for (int i = 0; i < Math.Min (bytes.Length, end.Length); ++i)
for (int i = 0; i < global::System.Math.Min (bytes.Length, end.Length); ++i)
Assert.AreEqual (end [i], bytes [i], prefix + ": byte " + i);
int cc = unix.GetCharCount (end, 0, end.Length);
@@ -1012,7 +1012,7 @@ namespace MonoTests.Mono.Unix {
Assert.AreEqual (start.Length, r, prefix + ": chars length");
for (int i = 0; i < Math.Min (r, start.Length); ++i) {
for (int i = 0; i < global::System.Math.Min (r, start.Length); ++i) {
Assert.AreEqual (start [i], chars [i], prefix + ": char " + i);
}
}