Re-generate libicu.so and ICU4C CTS header
The command:
./tools/icu4c_srcgen/generate_ndk.py
Change-Id: Ied644049eb1861c8517d974a9a79a176957dbc3e
diff --git a/libicu/cts_headers/number_mapper.h b/libicu/cts_headers/number_mapper.h
index d18b8b3..9ecd776 100644
--- a/libicu/cts_headers/number_mapper.h
+++ b/libicu/cts_headers/number_mapper.h
@@ -136,6 +136,16 @@
}
}
+ inline void setTo(const AffixPatternProvider* provider, UErrorCode& status) {
+ if (auto ptr = dynamic_cast<const PropertiesAffixPatternProvider*>(provider)) {
+ propertiesAPP = *ptr;
+ } else if (auto ptr = dynamic_cast<const CurrencyPluralInfoAffixProvider*>(provider)) {
+ currencyPluralInfoAPP = *ptr;
+ } else {
+ status = U_INTERNAL_PROGRAM_ERROR;
+ }
+ }
+
inline const AffixPatternProvider& get() const {
if (!currencyPluralInfoAPP.isBogus()) {
return currencyPluralInfoAPP;
@@ -153,9 +163,9 @@
/**
* A struct for ownership of a few objects needed for formatting.
*/
-struct DecimalFormatWarehouse {
+struct DecimalFormatWarehouse : public UMemory {
AutoAffixPatternProvider affixProvider;
-
+ LocalPointer<PluralRules> rules;
};