diff options
| author | Matt Ellis <matell@microsoft.com> | 2015-02-17 21:34:28 -0800 |
|---|---|---|
| committer | Matt Ellis <matell@microsoft.com> | 2015-02-17 21:34:28 -0800 |
| commit | f846ccff6be6b47f139a6b910cae20de54f54329 (patch) | |
| tree | 21eac9824fb1383a00958da06c26f18d73050464 | |
| parent | 2bebdeebbe323921a653abd646e0fb55b8c7da62 (diff) | |
| parent | f07a40b1f97a94fa8faaa064b7def5203329d6df (diff) | |
| download | coreclr-f846ccff6be6b47f139a6b910cae20de54f54329.tar.gz coreclr-f846ccff6be6b47f139a6b910cae20de54f54329.tar.bz2 coreclr-f846ccff6be6b47f139a6b910cae20de54f54329.zip | |
Merge pull request #292 from ellismg/remove-unix-specific-encoding-workaround
Remove Unix specific hack in Encoding.GetEncoding
| -rw-r--r-- | src/mscorlib/src/System/Text/Encoding.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/mscorlib/src/System/Text/Encoding.cs b/src/mscorlib/src/System/Text/Encoding.cs index 201a760d61..c515dce814 100644 --- a/src/mscorlib/src/System/Text/Encoding.cs +++ b/src/mscorlib/src/System/Text/Encoding.cs @@ -413,11 +413,6 @@ namespace System.Text #endif public static Encoding GetEncoding(int codepage) { -// TODO: Remove the PLATFOM_UNIX specific code in favor of there regular path. Right the regular path causes exceptions to be thrown -// which hangs the runtime on Unix. -#if PLATFORM_UNIX - return UTF8; -#else Encoding result = EncodingProvider.GetEncodingFromProvider(codepage); if (result != null) return result; @@ -552,7 +547,6 @@ namespace System.Text } return result; -#endif } [Pure] |