ICU-66108.tar.gz

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

diff --git a/icuSources/i18n/unicode/choicfmt.h b/icuSources/i18n/unicode/choicfmt.h
index 7e7d2618dd1fe7bee6057b69f80826ecfc99b2e3..3b2f48cb1f853ca1c3f84a735e7fc67c844daa82 100644 (file)
--- a/icuSources/i18n/unicode/choicfmt.h
+++ b/icuSources/i18n/unicode/choicfmt.h
@@ -26,13 +26,14 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file
  * \brief C++ API: Choice Format.
  */
 
 #if !UCONFIG_NO_FORMATTING
-#ifndef U_HIDE_DEPRECATED_API
 
 #include "unicode/fieldpos.h"
 #include "unicode/format.h"
@@ -40,7 +41,8 @@
 #include "unicode/numfmt.h"
 #include "unicode/unistr.h"
 
-#if U_SHOW_CPLUSPLUS_API
+#ifndef U_HIDE_DEPRECATED_API
+
 U_NAMESPACE_BEGIN
 
 class MessageFormat;
@@ -249,7 +251,7 @@ public:
      * @return a copy of this object
      * @deprecated ICU 49 Use MessageFormat instead, with plural and select arguments.
      */
-    virtual Format* clone(void) const;
+    virtual ChoiceFormat* clone() const;
 
     /**
      * Returns true if the given Format objects are semantically equal.
@@ -589,10 +591,11 @@ private:
 
 
 U_NAMESPACE_END
-#endif // U_SHOW_CPLUSPLUS_API
 
 #endif  // U_HIDE_DEPRECATED_API
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // CHOICFMT_H
 //eof