ICU-62107.0.1.tar.gz

[apple/icu.git] / icuSources / i18n / unicode / timezone.h

diff --git a/icuSources/i18n/unicode/timezone.h b/icuSources/i18n/unicode/timezone.h
index 0a1441ba49bff45e76d599cac632a1f781df4a4a..4e5d911aae93d462793a7eba53bd8e53a861a32f 100644 (file)
--- a/icuSources/i18n/unicode/timezone.h
+++ b/icuSources/i18n/unicode/timezone.h
@@ -1,3 +1,5 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*************************************************************************
 * Copyright (c) 1997-2016, International Business Machines Corporation
 * and others. All Rights Reserved.
@@ -41,6 +43,7 @@
 #include "unicode/ures.h"
 #include "unicode/ucal.h"
 
+#if U_SHOW_CPLUSPLUS_API
 U_NAMESPACE_BEGIN
 
 class StringEnumeration;
@@ -282,6 +285,8 @@ public:
      * and may return a different TimeZone from the one returned by
      * TimeZone::createDefault().
      *
+     * <p>This function is not thread safe.</p>
+     *
      * @return  A new instance of TimeZone detected from the current host system
      *          configuration.
      * @stable ICU 55
@@ -861,7 +866,7 @@ private:
      * @param id zone id string
      * @return the pointer of the ID resource, or NULL.
      */
-    static const UChar* findID(const UnicodeString& id);
+    static const char16_t* findID(const UnicodeString& id);
 
     /**
      * Resolve a link in Olson tzdata.  When the given id is known and it's not a link,
@@ -871,7 +876,7 @@ private:
      * @param id zone id string
      * @return the dereferenced zone or NULL
      */
-    static const UChar* dereferOlsonLink(const UnicodeString& id);
+    static const char16_t* dereferOlsonLink(const UnicodeString& id);
 
     /**
      * Returns the region code associated with the given zone,
@@ -879,7 +884,7 @@ private:
      * @param id zone id string
      * @return the region associated with the given zone
      */
-    static const UChar* getRegion(const UnicodeString& id);
+    static const char16_t* getRegion(const UnicodeString& id);
 
   public:
 #ifndef U_HIDE_INTERNAL_API
@@ -891,7 +896,7 @@ private:
      * @return the region associated with the given zone
      * @internal
      */
-    static const UChar* getRegion(const UnicodeString& id, UErrorCode& status);
+    static const char16_t* getRegion(const UnicodeString& id, UErrorCode& status);
 #endif  /* U_HIDE_INTERNAL_API */
 
   private:
@@ -956,6 +961,7 @@ TimeZone::setID(const UnicodeString& ID)
     fID = ID;
 }
 U_NAMESPACE_END
+#endif // U_SHOW_CPLUSPLUS_API
 
 #endif /* #if !UCONFIG_NO_FORMATTING */