ICU-13667 ICU 62rc BRS, update guard conditionals for non-stable API part 1 (i18n...

X-SVN-Rev: 41486

diff --git a/icu4c/source/i18n/unicode/compactdecimalformat.h b/icu4c/source/i18n/unicode/compactdecimalformat.h
index a529ae5c8ce4cdaf8f0d58a7bc0254e8442dc9ea..7dc92f610062f4e6e3004999ad075de941e73278 100644 (file)
--- a/icu4c/source/i18n/unicode/compactdecimalformat.h
+++ b/icu4c/source/i18n/unicode/compactdecimalformat.h
@@ -128,6 +128,7 @@ public:
      */
     void parse(const UnicodeString& text, Formattable& result, UErrorCode& status) const U_OVERRIDE;
 
+#ifndef U_HIDE_INTERNAL_API
     /**
      * Parses text from the given string as a currency amount.  Unlike
      * the parse() method, this method will attempt to parse a generic
@@ -149,6 +150,7 @@ public:
      * @internal
      */
     CurrencyAmount* parseCurrency(const UnicodeString& text, ParsePosition& pos) const U_OVERRIDE;
+#endif  /* U_HIDE_INTERNAL_API */
 
     /**
      * Return the class ID for this class.  This is useful only for

diff --git a/icu4c/source/i18n/unicode/decimfmt.h b/icu4c/source/i18n/unicode/decimfmt.h
index 3ce9e9eb37471e522b562123d25d94a60e02a65f..cb025bb285ba12033e2a691985e60b085aab3de1 100644 (file)
--- a/icu4c/source/i18n/unicode/decimfmt.h
+++ b/icu4c/source/i18n/unicode/decimfmt.h
@@ -759,6 +759,7 @@ class U_I18N_API DecimalFormat : public NumberFormat {
     /**
      * This API is for ICU use only.
      * Default internal constructor for DecimalFormat.
+     * @internal
      */
     DecimalFormat(const DecimalFormatSymbols* symbolsToAdopt, UErrorCode& status);
 
@@ -928,7 +929,7 @@ class U_I18N_API DecimalFormat : public NumberFormat {
      */
     UnicodeString& format(double number, UnicodeString& appendTo, FieldPosition& pos) const U_OVERRIDE;
 
-
+#ifndef U_HIDE_INTERNAL_API
     /**
      * Format a double or long number using base-10 representation.
      *
@@ -943,6 +944,7 @@ class U_I18N_API DecimalFormat : public NumberFormat {
      */
     UnicodeString& format(double number, UnicodeString& appendTo, FieldPosition& pos,
                           UErrorCode& status) const U_OVERRIDE;
+#endif  /* U_HIDE_INTERNAL_API */
 
     /**
      * Format a double or long number using base-10 representation.
@@ -973,6 +975,7 @@ class U_I18N_API DecimalFormat : public NumberFormat {
      */
     UnicodeString& format(int32_t number, UnicodeString& appendTo, FieldPosition& pos) const U_OVERRIDE;
 
+#ifndef U_HIDE_INTERNAL_API
     /**
      * Format a long number using base-10 representation.
      *
@@ -986,6 +989,7 @@ class U_I18N_API DecimalFormat : public NumberFormat {
      */
     UnicodeString& format(int32_t number, UnicodeString& appendTo, FieldPosition& pos,
                           UErrorCode& status) const U_OVERRIDE;
+#endif  /* U_HIDE_INTERNAL_API */
 
     /**
      * Format a long number using base-10 representation.
@@ -1016,6 +1020,7 @@ class U_I18N_API DecimalFormat : public NumberFormat {
      */
     UnicodeString& format(int64_t number, UnicodeString& appendTo, FieldPosition& pos) const U_OVERRIDE;
 
+#ifndef U_HIDE_INTERNAL_API
     /**
      * Format an int64 number using base-10 representation.
      *
@@ -1029,6 +1034,7 @@ class U_I18N_API DecimalFormat : public NumberFormat {
      */
     UnicodeString& format(int64_t number, UnicodeString& appendTo, FieldPosition& pos,
                           UErrorCode& status) const U_OVERRIDE;
+#endif  /* U_HIDE_INTERNAL_API */
 
     /**
      * Format an int64 number using base-10 representation.
@@ -1277,11 +1283,13 @@ class U_I18N_API DecimalFormat : public NumberFormat {
      */
     virtual void setNegativeSuffix(const UnicodeString& newValue);
 
+#ifndef U_HIDE_INTERNAL_API
     /**
      * Whether to show the plus sign on positive (non-negative) numbers; for example, "+12"
      * @internal Technical Preview
      */
     UBool isSignAlwaysShown() const;
+#endif  /* U_HIDE_INTERNAL_API */
 
     /**
      * Set whether to show the plus sign on positive (non-negative) numbers; for example, "+12"
@@ -1319,6 +1327,7 @@ class U_I18N_API DecimalFormat : public NumberFormat {
      */
     virtual void setMultiplier(int32_t newValue);
 
+#ifndef U_HIDE_DRAFT_API
     /**
      * Gets the power of ten by which number should be multiplied before formatting, which
      * can be combined with setMultiplier() to multiply by any arbitrary decimal value.
@@ -1332,6 +1341,7 @@ class U_I18N_API DecimalFormat : public NumberFormat {
      * @draft ICU 62
      */
     int32_t getMultiplierScale(void) const;
+#endif  /* U_HIDE_DRAFT_API */
 
     /**
      * Sets a power of ten by which number should be multiplied before formatting, which
@@ -2040,6 +2050,7 @@ class U_I18N_API DecimalFormat : public NumberFormat {
 
 #endif
 
+#ifndef U_HIDE_DRAFT_API
     /**
      * Converts this DecimalFormat to a NumberFormatter.  Starting in ICU 60,
      * NumberFormatter is the recommended way to format numbers.
@@ -2064,6 +2075,7 @@ class U_I18N_API DecimalFormat : public NumberFormat {
      * @draft ICU 62
      */
     const number::LocalizedNumberFormatter& toNumberFormatter() const;
+#endif  /* U_HIDE_DRAFT_API */
 
     /**
      * Return the class ID for this class.  This is useful only for

diff --git a/icu4c/source/i18n/unicode/numberformatter.h b/icu4c/source/i18n/unicode/numberformatter.h
index a876a0e8ac3229ffffb9eb8d5ebb208197f95806..d4ad74db8cbf7e7439df05b22b24e83369a26234 100644 (file)
--- a/icu4c/source/i18n/unicode/numberformatter.h
+++ b/icu4c/source/i18n/unicode/numberformatter.h
@@ -579,6 +579,7 @@ class U_I18N_API Precision : public UMemory {
     static SignificantDigitsPrecision minMaxSignificantDigits(int32_t minSignificantDigits,
                                                               int32_t maxSignificantDigits);
 
+#ifndef U_HIDE_DEPRECATED_API
     // Compatiblity methods that will be removed in ICU 64.
     // See http://bugs.icu-project.org/trac/ticket/13746
 
@@ -601,6 +602,7 @@ class U_I18N_API Precision : public UMemory {
     static inline SignificantDigitsPrecision minMaxDigits(int32_t a, int32_t b) {
         return minMaxSignificantDigits(a, b);
     }
+#endif  /* U_HIDE_DEPRECATED_API */
 
     /**
      * Show numbers rounded if necessary to the closest multiple of a certain rounding increment. For example, if the
@@ -642,6 +644,7 @@ class U_I18N_API Precision : public UMemory {
      */
     static CurrencyPrecision currency(UCurrencyUsage currencyUsage);
 
+#ifndef U_HIDE_DEPRECATED_API
     /**
      * Sets the rounding mode to use when picking the direction to round (up or down). Common values
      * include HALF_EVEN, HALF_UP, and FLOOR. The default is HALF_EVEN.
@@ -654,6 +657,7 @@ class U_I18N_API Precision : public UMemory {
      *            See http://bugs.icu-project.org/trac/ticket/13746
      */
     Precision withMode(UNumberFormatRoundingMode roundingMode) const;
+#endif  /* U_HIDE_DEPRECATED_API */
 
   private:
     enum PrecisionType {
@@ -1054,8 +1058,10 @@ class U_I18N_API Scale : public UMemory {
     /** @draft ICU 62 */
     ~Scale();
 
+#ifndef U_HIDE_INTERNAL_API
     /** @internal */
     Scale(int32_t magnitude, impl::DecNum* arbitraryToAdopt);
+#endif  /* U_HIDE_INTERNAL_API */
 
   private:
     int32_t fMagnitude;
@@ -1651,6 +1657,7 @@ class U_I18N_API NumberFormatterSettings {
      */
     Derived precision(const Precision& precision) &&;
 
+#ifndef U_HIDE_DEPRECATED_API
     // Compatibility method that will be removed in ICU 64.
     // Use precision() instead.
     // See http://bugs.icu-project.org/trac/ticket/13746
@@ -1658,6 +1665,7 @@ class U_I18N_API NumberFormatterSettings {
     Derived rounding(const Rounder& rounder) const & {
         return precision(rounder);
     }
+#endif  /* U_HIDE_DEPRECATED_API */
 
     /**
      * Specifies how to determine the direction to round a number when it has more digits than fit in the
@@ -2374,15 +2382,17 @@ class U_I18N_API LocalizedNumberFormatter
  */
 class U_I18N_API FormattedNumber : public UMemory {
   public:
+#ifndef U_HIDE_DEPRECATED_API
     /**
      * Returns a UnicodeString representation of the formatted number.
      *
      * @return a UnicodeString containing the localized number.
      * @deprecated ICU 62 Use the version of this method with an error code instead.
- *                    This method was never @stable and will be removed in a future release.
+     *                This method was never @stable and will be removed in a future release.
      *                See http://bugs.icu-project.org/trac/ticket/13746
      */
     UnicodeString toString() const;
+#endif  /* U_HIDE_DEPRECATED_API */
 
     /**
      * Returns a UnicodeString representation of the formatted number.
@@ -2394,6 +2404,7 @@ class U_I18N_API FormattedNumber : public UMemory {
      */
     UnicodeString toString(UErrorCode& status) const;
 
+#ifndef U_HIDE_DEPRECATED_API
     /**
      * Appends the formatted number to an Appendable.
      *
@@ -2401,11 +2412,12 @@ class U_I18N_API FormattedNumber : public UMemory {
      *            The Appendable to which to append the formatted number string.
      * @return The same Appendable, for chaining.
      * @deprecated ICU 62 Use the version of this method with an error code instead.
- *                    This method was never @stable and will be removed in a future release.
+     *                This method was never @stable and will be removed in a future release.
      *                See http://bugs.icu-project.org/trac/ticket/13746
      * @see Appendable
      */
     Appendable &appendTo(Appendable &appendable);
+#endif  /* U_HIDE_DEPRECATED_API */
 
     /**
      * Appends the formatted number to an Appendable.
@@ -2420,6 +2432,7 @@ class U_I18N_API FormattedNumber : public UMemory {
      */
     Appendable &appendTo(Appendable &appendable, UErrorCode& status);
 
+#ifndef U_HIDE_DEPRECATED_API
     /**
      * Determine the start and end indices of the first occurrence of the given <em>field</em> in the output string.
      * This allows you to determine the locations of the integer part, fraction part, and sign.
@@ -2441,6 +2454,7 @@ class U_I18N_API FormattedNumber : public UMemory {
      * @see UNumberFormatFields
      */
     void populateFieldPosition(FieldPosition &fieldPosition, UErrorCode &status);
+#endif  /* U_HIDE_DEPRECATED_API */
 
     /**
      * Determines the start and end indices of the next occurrence of the given <em>field</em> in the
@@ -2475,6 +2489,7 @@ class U_I18N_API FormattedNumber : public UMemory {
      */
     UBool nextFieldPosition(FieldPosition& fieldPosition, UErrorCode& status) const;
 
+#ifndef U_HIDE_DEPRECATED_API
     /**
      * Export the formatted number to a FieldPositionIterator. This allows you to determine which characters in
      * the output string correspond to which <em>fields</em>, such as the integer part, fraction part, and sign.
@@ -2491,6 +2506,7 @@ class U_I18N_API FormattedNumber : public UMemory {
      * @see UNumberFormatFields
      */
     void populateFieldPositionIterator(FieldPositionIterator &iterator, UErrorCode &status);
+#endif  /* U_HIDE_DEPRECATED_API */
 
     /**
      * Export the formatted number to a FieldPositionIterator. This allows you to determine which characters in

diff --git a/icu4c/source/i18n/unicode/unumberformatter.h b/icu4c/source/i18n/unicode/unumberformatter.h
index 32290dc2ccfbd6910b47f35f1c8d7c060e79f074..718132676029d6e7a23e8313d30ceecef080982f 100644 (file)
--- a/icu4c/source/i18n/unicode/unumberformatter.h
+++ b/icu4c/source/i18n/unicode/unumberformatter.h
@@ -76,6 +76,7 @@
  */
 
 
+#ifndef U_HIDE_DRAFT_API
 /**
  * An enum declaring how to render units, including currencies. Example outputs when formatting 123 USD and 123
  * meters in <em>en-CA</em>:
@@ -162,7 +163,9 @@ typedef enum UNumberUnitWidth {
      */
             UNUM_UNIT_WIDTH_COUNT
 } UNumberUnitWidth;
+#endif  /* U_HIDE_DRAFT_API */
 
+#ifndef U_HIDE_DRAFT_API
 /**
  * An enum declaring the strategy for when and how to display grouping separators (i.e., the
  * separator, often a comma or period, after every 2-3 powers of ten). The choices are several
@@ -254,14 +257,16 @@ typedef enum UGroupingStrategy {
             UNUM_GROUPING_THOUSANDS,
 
     /**
-     * One more than the highest UNumberSignDisplay value.
+     * One more than the highest UGroupingStrategy value.
      *
      * @internal ICU 62: The numeric value may change over time; see ICU ticket #12420.
      */
             UNUM_GROUPING_COUNT
 
 } UGroupingStrategy;
+#endif  /* U_HIDE_DRAFT_API */
 
+#ifndef U_HIDE_DRAFT_API
 /**
  * An enum declaring how to denote positive and negative numbers. Example outputs when formatting
  * 123, 0, and -123 in <em>en-US</em>:
@@ -355,7 +360,9 @@ typedef enum UNumberSignDisplay {
      */
             UNUM_SIGN_COUNT
 } UNumberSignDisplay;
+#endif  /* U_HIDE_DRAFT_API */
 
+#ifndef U_HIDE_DRAFT_API
 /**
  * An enum declaring how to render the decimal separator.
  *
@@ -388,8 +395,9 @@ typedef enum UNumberDecimalSeparatorDisplay {
      */
             UNUM_DECIMAL_SEPARATOR_COUNT
 } UNumberDecimalSeparatorDisplay;
+#endif  /* U_HIDE_DRAFT_API */
 
-
+#ifndef U_HIDE_DRAFT_API
 /**
  * C-compatible version of icu::number::LocalizedNumberFormatter.
  *
@@ -652,6 +660,7 @@ U_DEFINE_LOCAL_OPEN_POINTER(LocalUFormattedNumberPointer, UFormattedNumber, unum
 U_NAMESPACE_END
 #endif // U_SHOW_CPLUSPLUS_API
 
+#endif  /* U_HIDE_DRAFT_API */
 
 #endif //__UNUMBERFORMATTER_H__
 #endif /* #if !UCONFIG_NO_FORMATTING */

diff --git a/icu4c/source/i18n/unicode/uspoof.h b/icu4c/source/i18n/unicode/uspoof.h
index 002e704d4acb029f56adda7368c57de05304220e..781a88247fe4c5be0b263fb8ac9ef8738b4d7831 100644 (file)
--- a/icu4c/source/i18n/unicode/uspoof.h
+++ b/icu4c/source/i18n/unicode/uspoof.h
@@ -485,6 +485,7 @@ typedef enum USpoofChecks {
      */
     USPOOF_MIXED_NUMBERS            = 128,
 
+#ifndef U_HIDE_DRAFT_API
     /**
      * Check that an identifier does not have a combining character following a character in which that
      * combining character would be hidden; for example 'i' followed by a U+0307 combining dot.
@@ -505,6 +506,7 @@ typedef enum USpoofChecks {
      * @draft ICU 62
      */
     USPOOF_HIDDEN_OVERLAY            = 256,
+#endif  /* U_HIDE_DRAFT_API */
 
    /**
      * Enable all spoof checks.