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

source/i18n/unicode/measunit.h

 /*
 **********************************************************************
 * 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 167 matching lines @@
 
     /**
      * ICU use only.
      * Returns maximum value from getIndex plus 1.
      * @internal
      */
     static int32_t getIndexCount();
 
     /**
      * ICU use only.
+     * @return the unit.getIndex() of the unit which has this unit.getType() and unit.getSubtype(),
+     *         or a negative value if there is no such unit
+     * @internal
+     */
+    static int32_t internalGetIndexForTypeAndSubtype(const char *type, const char *subtype);
+
+    /**
+     * ICU use only.
      * @internal
      */
     static MeasureUnit *resolveUnitPerUnit(
             const MeasureUnit &unit, const MeasureUnit &perUnit);
 #endif /* U_HIDE_INTERNAL_API */
 
 // All code between the "Start generated createXXX methods" comment and
 // the "End generated createXXX methods" comment is auto generated code
 // and must not be edited manually. For instructions on how to correctly
 // update this code, refer to:
@@ skipping 1079 matching lines @@
     }
     void setTo(int32_t typeId, int32_t subTypeId);
     int32_t getOffset() const;
     static MeasureUnit *create(int typeId, int subTypeId, UErrorCode &status);
 };
 
 U_NAMESPACE_END
 
 #endif // !UNCONFIG_NO_FORMATTING
 #endif // __MEASUREUNIT_H__