organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 22:44:49 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

Merge pull request #53 from icu-units/k_to_g_fixup

Browse source 
fixup! ICU-21059 Load simple unit IDs from convertUnits.
This commit is contained in:
Hugo van der Merwe 2020-08-11 19:41:58 +02:00 • committed by GitHub
commit 2b3e904ab0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
icu4c/source/i18n/measunit_extra.cpp
View file

@ -173,11 +173,11 @@ icu::UInitOnce gUnitExtrasInitOnce = U_INITONCE_INITIALIZER;
// by SingleUnitImpl::getSimpleUnitID().)
const char **gSimpleUnits = nullptr;
char *kSerializedUnitExtrasStemTrie = nullptr;
char *gSerializedUnitExtrasStemTrie = nullptr;
UBool U_CALLCONV cleanupUnitExtras() {
uprv_free(kSerializedUnitExtrasStemTrie);
kSerializedUnitExtrasStemTrie = nullptr;
uprv_free(gSerializedUnitExtrasStemTrie);
gSerializedUnitExtrasStemTrie = nullptr;
uprv_free(gSimpleUnits);
gSimpleUnits = nullptr;
gUnitExtrasInitOnce.reset();
@ -250,12 +250,12 @@ void U_CALLCONV initUnitExtras(UErrorCode& status) {
// Copy the result into the global constant pointer
size_t numBytes = result.length();
kSerializedUnitExtrasStemTrie = static_cast<char *>(uprv_malloc(numBytes));
if (kSerializedUnitExtrasStemTrie == nullptr) {
gSerializedUnitExtrasStemTrie = static_cast<char *>(uprv_malloc(numBytes));
if (gSerializedUnitExtrasStemTrie == nullptr) {
status = U_MEMORY_ALLOCATION_ERROR;
return;
}
uprv_memcpy(kSerializedUnitExtrasStemTrie, result.data(), numBytes);
uprv_memcpy(gSerializedUnitExtrasStemTrie, result.data(), numBytes);
}
class Token {
@ -372,7 +372,7 @@ private:
Parser() : fSource(""), fTrie(u"") {}
Parser(StringPiece source)
: fSource(source), fTrie(kSerializedUnitExtrasStemTrie) {}
: fSource(source), fTrie(gSerializedUnitExtrasStemTrie) {}
inline bool hasNext() const {
return fIndex < fSource.length();