diff options
author | Jan Kotas <jkotas@microsoft.com> | 2017-05-05 20:48:28 -0700 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2017-05-06 09:20:34 -0700 |
commit | c853b030a2701b39cb098ea1facfd8721bba1cf1 (patch) | |
tree | 143ea211c092246ebbbecf189b6d3100a3d5f017 /src/mscorlib/shared/System | |
parent | 7babb04d94c58b8639ecbe6f9c8bef0a5d88cf05 (diff) | |
download | coreclr-c853b030a2701b39cb098ea1facfd8721bba1cf1.tar.gz coreclr-c853b030a2701b39cb098ea1facfd8721bba1cf1.tar.bz2 coreclr-c853b030a2701b39cb098ea1facfd8721bba1cf1.zip |
Delete moved files and fix build breaks
Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
Diffstat (limited to 'src/mscorlib/shared/System')
3 files changed, 19 insertions, 19 deletions
diff --git a/src/mscorlib/shared/System/Globalization/IdnMapping.Unix.cs b/src/mscorlib/shared/System/Globalization/IdnMapping.Unix.cs index f1ad6f1d0a..2bbda0d3a7 100644 --- a/src/mscorlib/shared/System/Globalization/IdnMapping.Unix.cs +++ b/src/mscorlib/shared/System/Globalization/IdnMapping.Unix.cs @@ -39,7 +39,7 @@ namespace System.Globalization } char[] outputHeap = new char[actualLength]; - fixed (char* pOutputHeap = outputHeap) + fixed (char* pOutputHeap = &outputHeap[0]) { actualLength = Interop.GlobalizationInterop.ToAscii(flags, unicode, count, pOutputHeap, actualLength); if (actualLength == 0 || actualLength > outputHeap.Length) @@ -66,7 +66,7 @@ namespace System.Globalization else { char[] output = new char[count]; - fixed (char* pOutput = output) + fixed (char* pOutput = &output[0]) { return GetUnicodeCore(ascii, count, flags, pOutput, count, reattempt: true); } diff --git a/src/mscorlib/shared/System/Globalization/NumberFormatInfo.cs b/src/mscorlib/shared/System/Globalization/NumberFormatInfo.cs index c44c085a69..179a7f68d7 100644 --- a/src/mscorlib/shared/System/Globalization/NumberFormatInfo.cs +++ b/src/mscorlib/shared/System/Globalization/NumberFormatInfo.cs @@ -84,7 +84,7 @@ namespace System.Globalization internal int percentDecimalDigits = 2; [OptionalField(VersionAdded = 2)] - internal int digitSubstitution = (int) DigitShapes.None; + internal int digitSubstitution = (int)DigitShapes.None; internal bool isReadOnly = false; @@ -131,7 +131,7 @@ namespace System.Globalization Contract.EndContractBlock(); } - private static void VerifyNativeDigits(string [] nativeDig, string propertyName) + private static void VerifyNativeDigits(string[] nativeDig, string propertyName) { if (nativeDig == null) { @@ -157,7 +157,7 @@ namespace System.Globalization { // Not 1 or 2 UTF-16 code points throw new ArgumentException(SR.Argument_InvalidNativeDigitValue, propertyName); - } + } else if (!char.IsSurrogatePair(nativeDig[i][0], nativeDig[i][1])) { // 2 UTF-6 code points, but not a surrogate pair @@ -175,8 +175,8 @@ namespace System.Globalization } } - private static void VerifyDigitSubstitution(DigitShapes digitSub, string propertyName) - { + private static void VerifyDigitSubstitution(DigitShapes digitSub, string propertyName) + { switch (digitSub) { case DigitShapes.Context: @@ -309,7 +309,7 @@ namespace System.Globalization set { VerifyWritable(); - VerifyDecimalSeparator(value, "CurrencyDecimalSeparator"); + VerifyDecimalSeparator(value, nameof(CurrencyDecimalSeparator)); currencyDecimalSeparator = value; } } @@ -404,13 +404,13 @@ namespace System.Globalization { if (value == null) { - throw new ArgumentNullException("PercentGroupSizes", + throw new ArgumentNullException(nameof(PercentGroupSizes), SR.ArgumentNull_Obj); } Contract.EndContractBlock(); VerifyWritable(); Int32[] inputSizes = (Int32[])value.Clone(); - CheckGroupSize("PercentGroupSizes", inputSizes); + CheckGroupSize(nameof(PercentGroupSizes), inputSizes); percentGroupSizes = inputSizes; } } @@ -807,9 +807,9 @@ namespace System.Globalization } } - public string [] NativeDigits + public string[] NativeDigits { - get { return (String[]) nativeDigits.Clone(); } + get { return (String[])nativeDigits.Clone(); } set { VerifyWritable(); @@ -820,12 +820,12 @@ namespace System.Globalization public DigitShapes DigitSubstitution { - get { return (DigitShapes) digitSubstitution; } + get { return (DigitShapes)digitSubstitution; } set { VerifyWritable(); VerifyDigitSubstitution(value, nameof(DigitSubstitution)); - digitSubstitution = (int) value; + digitSubstitution = (int)value; } } diff --git a/src/mscorlib/shared/System/Globalization/StringInfo.cs b/src/mscorlib/shared/System/Globalization/StringInfo.cs index f1dd30561b..ca57b67eb1 100644 --- a/src/mscorlib/shared/System/Globalization/StringInfo.cs +++ b/src/mscorlib/shared/System/Globalization/StringInfo.cs @@ -93,7 +93,7 @@ namespace System.Globalization { if (null == value) { - throw new ArgumentNullException("String", + throw new ArgumentNullException(nameof(String), SR.ArgumentNull_String); } Contract.EndContractBlock(); @@ -117,13 +117,13 @@ namespace System.Globalization } } - public string SubstringByTextElements(int startingTextElement) + public string SubstringByTextElements(int startingTextElement) { // If the string is empty, no sense going further. - if (null == this.Indexes) + if (null == this.Indexes) { // Just decide which error to give depending on the param they gave us.... - if (startingTextElement < 0) + if (startingTextElement < 0) { throw new ArgumentOutOfRangeException(nameof(startingTextElement), SR.ArgumentOutOfRange_NeedPosNum); } @@ -135,7 +135,7 @@ namespace System.Globalization return (SubstringByTextElements(startingTextElement, Indexes.Length - startingTextElement)); } - public string SubstringByTextElements(int startingTextElement, int lengthInTextElements) + public string SubstringByTextElements(int startingTextElement, int lengthInTextElements) { if (startingTextElement < 0) { |