ICU 56 step 4: Apply post-56 fixes for measure/date format

source/i18n/measunit.cpp

 /*
 **********************************************************************
 * Copyright (c) 2004-2015, International Business Machines
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 * Author: Alan Liu
 * Created: April 26, 2004
 * Since: ICU 3.0
 **********************************************************************
 */
@@ skipping 1134 matching lines @@
         uenum_close(uenum);
         return NULL;
     }
     return result;
 }
 
 int32_t MeasureUnit::getIndexCount() {
     return gIndexes[UPRV_LENGTHOF(gIndexes) - 1];
 }
 
+int32_t MeasureUnit::internalGetIndexForTypeAndSubtype(const char *type, const char *subtype) {
+    int32_t t = binarySearch(gTypes, 0, UPRV_LENGTHOF(gTypes), type);
+    if (t < 0) {
+        return t;
+    }
+    int32_t st = binarySearch(gSubTypes, gOffsets[t], gOffsets[t + 1], subtype);
+    if (st < 0) {
+        return st;
+    }
+    return gIndexes[t] + st - gOffsets[t];
+}
+
 MeasureUnit *MeasureUnit::resolveUnitPerUnit(
         const MeasureUnit &unit, const MeasureUnit &perUnit) {
     int32_t unitOffset = unit.getOffset();
     int32_t perUnitOffset = perUnit.getOffset();
 
     // binary search for (unitOffset, perUnitOffset)
     int32_t start = 0;
     int32_t end = UPRV_LENGTHOF(unitPerUnitToSingleUnit);
     while (start < end) {
         int32_t mid = (start + end) / 2;
@@ skipping 54 matching lines @@
     fCurrency[0] = 0;
 }
 
 int32_t MeasureUnit::getOffset() const {
     return gOffsets[fTypeId] + fSubTypeId;
 }
 
 U_NAMESPACE_END
 
 #endif /* !UNCONFIG_NO_FORMATTING */