Index: icu4c/source/i18n/regeximp.cpp |
=================================================================== |
--- icu4c/source/i18n/regeximp.cpp (revision 39545) |
+++ icu4c/source/i18n/regeximp.cpp (revision 39683) |
@@ -19,8 +19,7 @@ |
U_NAMESPACE_BEGIN |
CaseFoldingUTextIterator::CaseFoldingUTextIterator(UText &text) : |
- fUText(text), fcsp(NULL), fFoldChars(NULL), fFoldLength(0) { |
- fcsp = ucase_getSingleton(); |
+ fUText(text), fFoldChars(NULL), fFoldLength(0) { |
} |
CaseFoldingUTextIterator::~CaseFoldingUTextIterator() {} |
@@ -35,7 +34,7 @@ |
if (originalC == U_SENTINEL) { |
return originalC; |
} |
- fFoldLength = ucase_toFullFolding(fcsp, originalC, &fFoldChars, U_FOLD_CASE_DEFAULT); |
+ fFoldLength = ucase_toFullFolding(originalC, &fFoldChars, U_FOLD_CASE_DEFAULT); |
if (fFoldLength >= UCASE_MAX_STRING_LENGTH || fFoldLength < 0) { |
// input code point folds to a single code point, possibly itself. |
// See comment in ucase.h for explanation of return values from ucase_toFullFoldings. |
@@ -65,8 +64,7 @@ |
CaseFoldingUCharIterator::CaseFoldingUCharIterator(const UChar *chars, int64_t start, int64_t limit) : |
- fChars(chars), fIndex(start), fLimit(limit), fcsp(NULL), fFoldChars(NULL), fFoldLength(0) { |
- fcsp = ucase_getSingleton(); |
+ fChars(chars), fIndex(start), fLimit(limit), fFoldChars(NULL), fFoldLength(0) { |
} |
@@ -84,7 +82,7 @@ |
} |
U16_NEXT(fChars, fIndex, fLimit, originalC); |
- fFoldLength = ucase_toFullFolding(fcsp, originalC, &fFoldChars, U_FOLD_CASE_DEFAULT); |
+ fFoldLength = ucase_toFullFolding(originalC, &fFoldChars, U_FOLD_CASE_DEFAULT); |
if (fFoldLength >= UCASE_MAX_STRING_LENGTH || fFoldLength < 0) { |
// input code point folds to a single code point, possibly itself. |
// See comment in ucase.h for explanation of return values from ucase_toFullFoldings. |