Index: icu4c/source/common/uprops.cpp |
=================================================================== |
--- icu4c/source/common/uprops.cpp (revision 39545) |
+++ icu4c/source/common/uprops.cpp (revision 39683) |
@@ -128,9 +128,8 @@ |
} |
if(c>=0) { |
/* single code point */ |
- const UCaseProps *csp=ucase_getSingleton(); |
const UChar *resultString; |
- return (UBool)(ucase_toFullFolding(csp, c, &resultString, U_FOLD_CASE_DEFAULT)>=0); |
+ return (UBool)(ucase_toFullFolding(c, &resultString, U_FOLD_CASE_DEFAULT)>=0); |
} else { |
/* guess some large but stack-friendly capacity */ |
UChar dest[2*UCASE_MAX_STRING_LENGTH]; |
@@ -576,7 +575,6 @@ |
// case folding and NFKC.) |
// For the derivation, see Unicode's DerivedNormalizationProps.txt. |
const Normalizer2 *nfkc=Normalizer2::getNFKCInstance(*pErrorCode); |
- const UCaseProps *csp=ucase_getSingleton(); |
if(U_FAILURE(*pErrorCode)) { |
return 0; |
} |
@@ -583,7 +581,7 @@ |
// first: b = NFKC(Fold(a)) |
UnicodeString folded1String; |
const UChar *folded1; |
- int32_t folded1Length=ucase_toFullFolding(csp, c, &folded1, U_FOLD_CASE_DEFAULT); |
+ int32_t folded1Length=ucase_toFullFolding(c, &folded1, U_FOLD_CASE_DEFAULT); |
if(folded1Length<0) { |
const Normalizer2Impl *nfkcImpl=Normalizer2Factory::getImpl(nfkc); |
if(nfkcImpl->getCompQuickCheck(nfkcImpl->getNorm16(c))!=UNORM_NO) { |