summaryrefslogtreecommitdiff
path: root/deps/icu-small/source/i18n/number_modifiers.cpp
diff options
context:
space:
mode:
authorMichaƫl Zasso <targos@protonmail.com>2020-11-20 12:57:06 +0100
committerNode.js GitHub Bot <github-bot@iojs.org>2020-11-22 20:58:08 +0000
commitf3821cd8d797bb9f3857f379968206226aa3ac46 (patch)
treea957e0e80777aec4f625910fffec7e4fe4908ef4 /deps/icu-small/source/i18n/number_modifiers.cpp
parent62a56264f618239479088d59e532828d46adccf0 (diff)
downloadnode-new-f3821cd8d797bb9f3857f379968206226aa3ac46.tar.gz
deps: update ICU to 68.1
Refs: https://github.com/unicode-org/icu/releases/tag/release-68-1 PR-URL: https://github.com/nodejs/node/pull/36187 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Michael Dawson <midawson@redhat.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Diffstat (limited to 'deps/icu-small/source/i18n/number_modifiers.cpp')
-rw-r--r--deps/icu-small/source/i18n/number_modifiers.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/deps/icu-small/source/i18n/number_modifiers.cpp b/deps/icu-small/source/i18n/number_modifiers.cpp
index 3becb7ba85..b7d825f499 100644
--- a/deps/icu-small/source/i18n/number_modifiers.cpp
+++ b/deps/icu-small/source/i18n/number_modifiers.cpp
@@ -25,13 +25,13 @@ const int32_t ARG_NUM_LIMIT = 0x100;
icu::UInitOnce gDefaultCurrencySpacingInitOnce = U_INITONCE_INITIALIZER;
UnicodeSet *UNISET_DIGIT = nullptr;
-UnicodeSet *UNISET_NOTS = nullptr;
+UnicodeSet *UNISET_NOTSZ = nullptr;
UBool U_CALLCONV cleanupDefaultCurrencySpacing() {
delete UNISET_DIGIT;
UNISET_DIGIT = nullptr;
- delete UNISET_NOTS;
- UNISET_NOTS = nullptr;
+ delete UNISET_NOTSZ;
+ UNISET_NOTSZ = nullptr;
gDefaultCurrencySpacingInitOnce.reset();
return TRUE;
}
@@ -39,13 +39,13 @@ UBool U_CALLCONV cleanupDefaultCurrencySpacing() {
void U_CALLCONV initDefaultCurrencySpacing(UErrorCode &status) {
ucln_i18n_registerCleanup(UCLN_I18N_CURRENCY_SPACING, cleanupDefaultCurrencySpacing);
UNISET_DIGIT = new UnicodeSet(UnicodeString(u"[:digit:]"), status);
- UNISET_NOTS = new UnicodeSet(UnicodeString(u"[:^S:]"), status);
- if (UNISET_DIGIT == nullptr || UNISET_NOTS == nullptr) {
+ UNISET_NOTSZ = new UnicodeSet(UnicodeString(u"[[:^S:]&[:^Z:]]"), status);
+ if (UNISET_DIGIT == nullptr || UNISET_NOTSZ == nullptr) {
status = U_MEMORY_ALLOCATION_ERROR;
return;
}
UNISET_DIGIT->freeze();
- UNISET_NOTS->freeze();
+ UNISET_NOTSZ->freeze();
}
} // namespace
@@ -469,8 +469,8 @@ CurrencySpacingEnabledModifier::getUnicodeSet(const DecimalFormatSymbols &symbol
status);
if (pattern.compare(u"[:digit:]", -1) == 0) {
return *UNISET_DIGIT;
- } else if (pattern.compare(u"[:^S:]", -1) == 0) {
- return *UNISET_NOTS;
+ } else if (pattern.compare(u"[[:^S:]&[:^Z:]]", -1) == 0) {
+ return *UNISET_NOTSZ;
} else {
return UnicodeSet(pattern, status);
}