From: Shane Carr <shane@unicode.org>
Date: Thu, 5 Oct 2017 00:47:08 +0000 (+0000)
Subject: ICU-13093 For AIX compatibility, replacing inline initializers with memset in Measure... 
X-Git-Tag: release-60-rc~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5b3c2a9d69eb316bf563f44718cb49acf8f2757;p=icu

ICU-13093 For AIX compatibility, replacing inline initializers with memset in MeasureFormatCacheData constructor.

X-SVN-Rev: 40559
---

diff --git a/icu4c/source/i18n/measfmt.cpp b/icu4c/source/i18n/measfmt.cpp
index 32a843b6222..2ef53295458 100644
--- a/icu4c/source/i18n/measfmt.cpp
+++ b/icu4c/source/i18n/measfmt.cpp
@@ -111,8 +111,8 @@ public:
      */
     UMeasureFormatWidth widthFallback[WIDTH_INDEX_COUNT];
     /** Measure unit -> format width -> array of patterns ("{0} meters") (plurals + PER_UNIT_INDEX) */
-    SimpleFormatter* patterns[MEAS_UNIT_COUNT][WIDTH_INDEX_COUNT][PATTERN_COUNT] = {};
-    const UChar* dnams[MEAS_UNIT_COUNT][WIDTH_INDEX_COUNT] = {};
+    SimpleFormatter* patterns[MEAS_UNIT_COUNT][WIDTH_INDEX_COUNT][PATTERN_COUNT];
+    const UChar* dnams[MEAS_UNIT_COUNT][WIDTH_INDEX_COUNT];
     SimpleFormatter perFormatters[WIDTH_INDEX_COUNT];
 
     MeasureFormatCacheData();
@@ -147,21 +147,25 @@ public:
     }
 
 private:
-    NumberFormat* currencyFormats[WIDTH_INDEX_COUNT] = {};
-    NumberFormat* integerFormat = nullptr;
-    NumericDateFormatters* numericDateFormatters = nullptr;
+    NumberFormat* currencyFormats[WIDTH_INDEX_COUNT];
+    NumberFormat* integerFormat;
+    NumericDateFormatters* numericDateFormatters;
 
     MeasureFormatCacheData(const MeasureFormatCacheData &other);
     MeasureFormatCacheData &operator=(const MeasureFormatCacheData &other);
 };
 
-MeasureFormatCacheData::MeasureFormatCacheData() {
+MeasureFormatCacheData::MeasureFormatCacheData()
+        : integerFormat(nullptr), numericDateFormatters(nullptr) {
     // Please update MEAS_UNIT_COUNT if it gets out of sync with the true count!
     U_ASSERT(MEAS_UNIT_COUNT == MeasureUnit::getIndexCount());
 
     for (int32_t i = 0; i < WIDTH_INDEX_COUNT; ++i) {
         widthFallback[i] = UMEASFMT_WIDTH_COUNT;
     }
+    memset(&patterns[0][0][0], 0, sizeof(patterns));
+    memset(&dnams[0][0], 0, sizeof(dnams));
+    memset(currencyFormats, 0, sizeof(currencyFormats));
 }
 
 MeasureFormatCacheData::~MeasureFormatCacheData() {