diff options
author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-23 15:20:34 +0000 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-23 15:20:34 +0000 |
commit | a42bed2e9a78715889240ff900e2391bef923285 (patch) | |
tree | 202c502b7e964384fb7f0639b756353374b0c045 /intl/icu/source/i18n/zonemeta.cpp | |
parent | 9a2224a97c7d258fc1f0e5fad30706987880ce22 (diff) | |
parent | 276f6583e00edf2a217a3092471ca2aa3aab5a09 (diff) | |
download | UXP-a42bed2e9a78715889240ff900e2391bef923285.tar UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.gz UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.lz UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.xz UXP-a42bed2e9a78715889240ff900e2391bef923285.zip |
Merge branch 'master' into remove-unboxed
# Conflicts:
# js/src/jit/BaselineIC.cpp
# js/src/jsarray.cpp
Diffstat (limited to 'intl/icu/source/i18n/zonemeta.cpp')
-rw-r--r-- | intl/icu/source/i18n/zonemeta.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/intl/icu/source/i18n/zonemeta.cpp b/intl/icu/source/i18n/zonemeta.cpp index fdf333c37..dd3bf202f 100644 --- a/intl/icu/source/i18n/zonemeta.cpp +++ b/intl/icu/source/i18n/zonemeta.cpp @@ -683,7 +683,6 @@ ZoneMeta::createMetazoneMappings(const UnicodeString &tzid) { mzMappings = new UVector(deleteOlsonToMetaMappingEntry, NULL, status); if (U_FAILURE(status)) { delete mzMappings; - deleteOlsonToMetaMappingEntry(entry); uprv_free(entry); break; } |