ICU-66108.tar.gz

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

diff --git a/icuSources/i18n/unicode/tzfmt.h b/icuSources/i18n/unicode/tzfmt.h
index aae5486bdb1c7914617e73cd94d31b9e74b60544..6d3863b1e5add8bf1f8ee55c67125e55999ed245 100644 (file)
--- a/icuSources/i18n/unicode/tzfmt.h
+++ b/icuSources/i18n/unicode/tzfmt.h
@@ -16,6 +16,8 @@
 
 #include "unicode/utypes.h"
 
 
 #include "unicode/utypes.h"
 

+#if U_SHOW_CPLUSPLUS_API
+

 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/format.h"
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/format.h"


@@ -237,10 +239,10 @@ typedef enum UTimeZoneFormatParseOption {
      */
     UTZFMT_PARSE_OPTION_ALL_STYLES  = 0x01,
      /**
      */
     UTZFMT_PARSE_OPTION_ALL_STYLES  = 0x01,
      /**

-      * When parsing a time zone display name in UTZFMT_STYLE_SPECIFIC_SHORT,
+      * When parsing a time zone display name in \link UTZFMT_STYLE_SPECIFIC_SHORT \endlink,

       * look for the IANA tz database compatible zone abbreviations in addition
       * look for the IANA tz database compatible zone abbreviations in addition

-      * to the localized names coming from the {@link TimeZoneNames} currently
-      * used by the {@link TimeZoneFormat}. 
+      * to the localized names coming from the icu::TimeZoneNames currently
+      * used by the icu::TimeZoneFormat.

       * @stable ICU 54
       */
     UTZFMT_PARSE_OPTION_TZ_DATABASE_ABBREVIATIONS = 0x02
       * @stable ICU 54
       */
     UTZFMT_PARSE_OPTION_TZ_DATABASE_ABBREVIATIONS = 0x02


@@ -248,7 +250,6 @@ typedef enum UTimeZoneFormatParseOption {
 
 U_CDECL_END
 
 
 U_CDECL_END
 

-#if U_SHOW_CPLUSPLUS_API

 U_NAMESPACE_BEGIN
 
 class TimeZoneGenericNames;
 U_NAMESPACE_BEGIN
 
 class TimeZoneGenericNames;


@@ -306,7 +307,7 @@ public:
      * @return A copy of the object
      * @stable ICU 50
      */
      * @return A copy of the object
      * @stable ICU 50
      */

-    virtual Format* clone() const;
+    virtual TimeZoneFormat* clone() const;

 
     /**
      * Creates an instance of <code>TimeZoneFormat</code> for the given locale.
 
     /**
      * Creates an instance of <code>TimeZoneFormat</code> for the given locale.


@@ -1093,7 +1094,9 @@ private:
 };
 
 U_NAMESPACE_END
 };
 
 U_NAMESPACE_END

-#endif // U_SHOW_CPLUSPLUS_API

 
 #endif /* !UCONFIG_NO_FORMATTING */
 
 #endif /* !UCONFIG_NO_FORMATTING */

+
+#endif /* U_SHOW_CPLUSPLUS_API */
+

 #endif
 #endif