Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@@ -1338,8 +1338,10 @@ namespace System.Text {
}
while (true) {
#if !MONO
int p = pos;
int i = pos;
#endif
while (pos < len) {
ch = format[pos];
@@ -1406,8 +1408,10 @@ namespace System.Text {
StringBuilder fmt = null;
if (ch == ':') {
pos++;
#if !MONO
p = pos;
i = pos;
#endif
while (true) {
if (pos == len) FormatError();
ch = format[pos];
@@ -1559,7 +1563,9 @@ namespace System.Text {
if (newValue == null)
newValue = "";
#if !MONO
int deltaLength = newValue.Length - oldValue.Length;
#endif
int[] replacements = null; // A list of replacement positions in a chunk to apply
int replacementsCount = 0;
@@ -1597,7 +1603,9 @@ namespace System.Text {
{
// Replacing mutates the blocks, so we need to convert to logical index and back afterward.
int index = indexInChunk + chunk.m_ChunkOffset;
#if !MONO
int indexBeforeAdjustment = index;
#endif
// See if we accumulated any replacements, if so apply them
ReplaceAllInChunk(replacements, replacementsCount, chunk, oldValue.Length, newValue);