diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-01-04 04:48:17 +0300 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-01-04 04:48:17 +0300 |
| commit | 27c71ea5867401d0c6046ce3926a5259ab82d9ed (patch) | |
| tree | 8340dbf922ef555e1d1b72406efeddf4a5f7d88c /src/Common | |
| parent | 0a2ae2c2fe664b17207fd96305005aa81f3df4cb (diff) | |
Fix incorrectly resolved merge conflict
[tfs-changeset: 1560836]
Diffstat (limited to 'src/Common')
| -rw-r--r-- | src/Common/src/System/Globalization/FormatProvider.Number.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Common/src/System/Globalization/FormatProvider.Number.cs b/src/Common/src/System/Globalization/FormatProvider.Number.cs index 5970f7a2a..0d765ec29 100644 --- a/src/Common/src/System/Globalization/FormatProvider.Number.cs +++ b/src/Common/src/System/Globalization/FormatProvider.Number.cs @@ -1220,7 +1220,7 @@ namespace System.Globalization char* dig = number.digits; char ch; - section = FindSection(format, number.digits[0] == 0 ? 2 : number.sign ? 1 : 0); + section = FindSection(format, dig[0] == 0 ? 2 : number.sign ? 1 : 0); while (true) { @@ -1403,6 +1403,8 @@ namespace System.Globalization fixed (char* pFormat = format) { + char * cur = dig; + while ((ch = pFormat[src++]) != 0 && ch != ';') { if (adjust > 0) @@ -1416,7 +1418,7 @@ namespace System.Globalization { // digPos will be one greater than thousandsSepPos[thousandsSepCtr] since we are at // the character after which the groupSeparator needs to be appended. - sb.Append(*dig != 0 ? *dig++ : '0'); + sb.Append(*cur != 0 ? *cur++ : '0'); if (thousandSeps && digPos > 1 && thousandsSepCtr >= 0) { if (digPos == thousandsSepPos[thousandsSepCtr] + 1) @@ -1444,7 +1446,7 @@ namespace System.Globalization } else { - ch = *dig != 0 ? *dig++ : digPos > lastDigit ? '0' : '\0'; + ch = *cur != 0 ? *cur++ : digPos > lastDigit ? '0' : '\0'; } if (ch != 0) { @@ -1470,7 +1472,7 @@ namespace System.Globalization break; } // If the format has trailing zeros or the format has a decimal and digits remain - if (lastDigit < 0 || (decimalPos < digitCount && *dig != 0)) + if (lastDigit < 0 || (decimalPos < digitCount && *cur != 0)) { sb.Append(info.NumberDecimalSeparator); decimalWritten = true; |