diff options
author | Jan Kotas <jkotas@microsoft.com> | 2016-01-30 11:38:18 -0800 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2016-01-30 11:38:18 -0800 |
commit | d196fdf2ea4bc67ab509b68b31870ae9e50a7c54 (patch) | |
tree | d45912d5344c59f475fac34606629cd9a572e72b | |
parent | 33623650a16cd6f66c850680c6621e49e14779ba (diff) | |
parent | 533ffd962d846dec37ba6d36abfd2746856293ca (diff) | |
download | coreclr-d196fdf2ea4bc67ab509b68b31870ae9e50a7c54.tar.gz coreclr-d196fdf2ea4bc67ab509b68b31870ae9e50a7c54.tar.bz2 coreclr-d196fdf2ea4bc67ab509b68b31870ae9e50a7c54.zip |
Merge pull request #2931 from jkotas/glob-revert
Revert "Add un-prefixed signatures as temporary workaround"
-rw-r--r-- | src/corefx/System.Globalization.Native/idna.cpp | 18 | ||||
-rw-r--r-- | src/corefx/System.Globalization.Native/normalization.cpp | 18 |
2 files changed, 0 insertions, 36 deletions
diff --git a/src/corefx/System.Globalization.Native/idna.cpp b/src/corefx/System.Globalization.Native/idna.cpp index adf6a3abc0..4820d2c3f2 100644 --- a/src/corefx/System.Globalization.Native/idna.cpp +++ b/src/corefx/System.Globalization.Native/idna.cpp @@ -53,15 +53,6 @@ extern "C" int32_t GlobalizationNative_ToAscii( return ((U_SUCCESS(err) || (err == U_BUFFER_OVERFLOW_ERROR)) && (info.errors == 0)) ? asciiStrLen : 0; } -// TODO: temporarily keeping the un-prefixed signature of this method -// to keep tests running in CI. This will be removed once the corefx managed assemblies -// are synced up with the native assemblies. -extern "C" int32_t ToAscii( - uint32_t flags, const UChar* lpSrc, int32_t cwSrcLength, UChar* lpDst, int32_t cwDstLength) -{ - return GlobalizationNative_ToAscii(flags, lpSrc, cwSrcLength, lpDst, cwDstLength); -} - /* Function: ToUnicode @@ -87,12 +78,3 @@ extern "C" int32_t GlobalizationNative_ToUnicode( return ((U_SUCCESS(err) || (err == U_BUFFER_OVERFLOW_ERROR)) && (info.errors == 0)) ? unicodeStrLen : 0; } - -// TODO: temporarily keeping the un-prefixed signature of this method -// to keep tests running in CI. This will be removed once the corefx managed assemblies -// are synced up with the native assemblies. -extern "C" int32_t ToUnicode( - int32_t flags, const UChar* lpSrc, int32_t cwSrcLength, UChar* lpDst, int32_t cwDstLength) -{ - return GlobalizationNative_ToUnicode(flags, lpSrc, cwSrcLength, lpDst, cwDstLength); -} diff --git a/src/corefx/System.Globalization.Native/normalization.cpp b/src/corefx/System.Globalization.Native/normalization.cpp index 0115af28ca..f96f5ee315 100644 --- a/src/corefx/System.Globalization.Native/normalization.cpp +++ b/src/corefx/System.Globalization.Native/normalization.cpp @@ -65,15 +65,6 @@ extern "C" int32_t GlobalizationNative_IsNormalized( } } -// TODO: temporarily keeping the un-prefixed signature of this method -// to keep tests running in CI. This will be removed once the corefx managed assemblies -// are synced up with the native assemblies. -extern "C" int32_t IsNormalized( - NormalizationForm normalizationForm, const UChar* lpStr, int32_t cwStrLength) -{ - return GlobalizationNative_IsNormalized(normalizationForm, lpStr, cwStrLength); -} - /* Function: NormalizeString @@ -95,12 +86,3 @@ extern "C" int32_t GlobalizationNative_NormalizeString( return (U_SUCCESS(err) || (err == U_BUFFER_OVERFLOW_ERROR)) ? normalizedLen : 0; } - -// TODO: temporarily keeping the un-prefixed signature of this method -// to keep tests running in CI. This will be removed once the corefx managed assemblies -// are synced up with the native assemblies. -extern "C" int32_t NormalizeString( - NormalizationForm normalizationForm, const UChar* lpSrc, int32_t cwSrcLength, UChar* lpDst, int32_t cwDstLength) -{ - return GlobalizationNative_NormalizeString(normalizationForm, lpSrc, cwSrcLength, lpDst, cwDstLength); -} |