From 533ffd962d846dec37ba6d36abfd2746856293ca Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Sat, 30 Jan 2016 08:10:25 -0800 Subject: [PATCH] Revert "Add un-prefixed signatures as temporary workaround" This reverts commit 6b1d2938ec4a5a2c64fd849797ec7800ed3ab575. --- src/corefx/System.Globalization.Native/idna.cpp | 18 ------------------ .../System.Globalization.Native/normalization.cpp | 18 ------------------ 2 files changed, 36 deletions(-) diff --git a/src/corefx/System.Globalization.Native/idna.cpp b/src/corefx/System.Globalization.Native/idna.cpp index adf6a3a..4820d2c 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 0115af2..f96f5ee 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); -} -- 2.7.4