diff options
| author | Fredrik Roubert <roubert@google.com> | 2017-11-27 19:42:42 +0100 |
|---|---|---|
| committer | Fredrik Roubert <roubert@google.com> | 2017-11-27 19:42:42 +0100 |
| commit | ffdc27edd5503111189fc11165c5a11289a71f79 (patch) | |
| tree | 74ddbae45bd027ffcf89c49fce88fa10b87c2441 /icu4c/source/i18n/zonemeta.cpp | |
| parent | 5b799ec90d4adb7ac53c10ac2cda84310f127bf7 (diff) | |
| download | icu-ffdc27edd5503111189fc11165c5a11289a71f79.tar.gz | |
Copy ICU4C 60 release from icu-project.org to aosp/icu60.
These files were exported from the ICU Subversion repository by running
the following command:
svn export \
http://source.icu-project.org/repos/icu/tags/release-60-1/icu4c icu4c
Change-Id: I6cb528ea335e4499fd6a648d19fbe98d325c5ff7
Diffstat (limited to 'icu4c/source/i18n/zonemeta.cpp')
| -rw-r--r-- | icu4c/source/i18n/zonemeta.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/icu4c/source/i18n/zonemeta.cpp b/icu4c/source/i18n/zonemeta.cpp index 84a965780..c386b0cae 100644 --- a/icu4c/source/i18n/zonemeta.cpp +++ b/icu4c/source/i18n/zonemeta.cpp @@ -690,7 +690,6 @@ ZoneMeta::createMetazoneMappings(const UnicodeString &tzid) { mzMappings = new UVector(deleteOlsonToMetaMappingEntry, NULL, status); if (U_FAILURE(status)) { delete mzMappings; - deleteOlsonToMetaMappingEntry(entry); uprv_free(entry); break; } @@ -792,7 +791,7 @@ static void U_CALLCONV initAvailableMetaZoneIDs () { break; } const char *mzID = ures_getKey(&res); - int32_t len = uprv_strlen(mzID); + int32_t len = static_cast<int32_t>(uprv_strlen(mzID)); UChar *uMzID = (UChar*)uprv_malloc(sizeof(UChar) * (len + 1)); if (uMzID == NULL) { status = U_MEMORY_ALLOCATION_ERROR; |