Update ICU to 54.1 step 1

source/i18n/tznames_impl.h

Index: source/i18n/tznames_impl.h
diff --git a/source/i18n/tznames_impl.h b/source/i18n/tznames_impl.h
index c677a8b9537a536560818745a70179f4a69584d8..5e5d96829e79caa76f4b52617a87e603ae6ef456 100644
--- a/source/i18n/tznames_impl.h
+++ b/source/i18n/tznames_impl.h
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (C) 2011-2013, International Business Machines Corporation and    *
+ * Copyright (C) 2011-2014, International Business Machines Corporation and    *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
@@ -186,6 +186,11 @@ public:
 
     static UnicodeString& getDefaultExemplarLocationName(const UnicodeString& tzID, UnicodeString& name);
 
+    static StringEnumeration* _getAvailableMetaZoneIDs(UErrorCode& status);
+    static StringEnumeration* _getAvailableMetaZoneIDs(const UnicodeString& tzID, UErrorCode& status);
+    static UnicodeString& _getMetaZoneID(const UnicodeString& tzID, UDate date, UnicodeString& mzID);
+    static UnicodeString& _getReferenceZoneID(const UnicodeString& mzID, const char* region, UnicodeString& tzID);
+
 private:
 
     Locale fLocale;
@@ -207,6 +212,34 @@ private:
     TZNames* loadTimeZoneNames(const UnicodeString& mzId);
 };
 
+class TZDBNames;
+
+class TZDBTimeZoneNames : public TimeZoneNames {
+public:
+    TZDBTimeZoneNames(const Locale& locale);
+    virtual ~TZDBTimeZoneNames();
+
+    virtual UBool operator==(const TimeZoneNames& other) const;
+    virtual TimeZoneNames* clone() const;
+
+    StringEnumeration* getAvailableMetaZoneIDs(UErrorCode& status) const;
+    StringEnumeration* getAvailableMetaZoneIDs(const UnicodeString& tzID, UErrorCode& status) const;
+
+    UnicodeString& getMetaZoneID(const UnicodeString& tzID, UDate date, UnicodeString& mzID) const;
+    UnicodeString& getReferenceZoneID(const UnicodeString& mzID, const char* region, UnicodeString& tzID) const;
+
+    UnicodeString& getMetaZoneDisplayName(const UnicodeString& mzID, UTimeZoneNameType type, UnicodeString& name) const;
+    UnicodeString& getTimeZoneDisplayName(const UnicodeString& tzID, UTimeZoneNameType type, UnicodeString& name) const;
+
+    TimeZoneNames::MatchInfoCollection* find(const UnicodeString& text, int32_t start, uint32_t types, UErrorCode& status) const;
+
+    static const TZDBNames* getMetaZoneNames(const UnicodeString& mzId, UErrorCode& status);
+
+private:
+    Locale fLocale;
+    char fRegion[ULOC_COUNTRY_CAPACITY];
+};
+
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */