1 files changed, 10 insertions, 21 deletions

diff --git a/deps/icu-small/source/i18n/unicode/decimfmt.h b/deps/icu-small/source/i18n/unicode/decimfmt.h
index 097a38fb88..e539b9af23 100644
--- a/deps/icu-small/source/i18n/unicode/decimfmt.h
+++ b/deps/icu-small/source/i18n/unicode/decimfmt.h
@@ -28,6 +28,9 @@
 #define DECIMFMT_H
 
 #include "unicode/utypes.h"
+
+#if U_SHOW_CPLUSPLUS_API
+
 /**
  * \file
  * \brief C++ API: Compatibility APIs for decimal formatting.
@@ -896,7 +899,7 @@ class U_I18N_API DecimalFormat : public NumberFormat {
      * @return    a polymorphic copy of this DecimalFormat.
      * @stable ICU 2.0
      */
-    Format* clone(void) const U_OVERRIDE;
+    DecimalFormat* clone() const U_OVERRIDE;
 
     /**
      * Return true if the given Format objects are semantically equal.
@@ -1331,7 +1334,6 @@ 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.
@@ -1342,7 +1344,7 @@ class U_I18N_API DecimalFormat : public NumberFormat {
      * This method is analogous to UNUM_SCALE in getAttribute.
      *
      * @return    the current value of the power-of-ten multiplier.
-     * @draft ICU 62
+     * @stable ICU 62
      */
     int32_t getMultiplierScale(void) const;
 
@@ -1363,10 +1365,9 @@ class U_I18N_API DecimalFormat : public NumberFormat {
      * This method is analogous to UNUM_SCALE in setAttribute.
      *
      * @param newValue    the new value of the power-of-ten multiplier.
-     * @draft ICU 62
+     * @stable ICU 62
      */
     void setMultiplierScale(int32_t newValue);
-#endif  /* U_HIDE_DRAFT_API */
 
     /**
      * Get the rounding increment.
@@ -2020,12 +2021,14 @@ class U_I18N_API DecimalFormat : public NumberFormat {
      */
     void setCurrency(const char16_t* theCurrency, UErrorCode& ec) U_OVERRIDE;
 
+#ifndef U_FORCE_HIDE_DEPRECATED_API
     /**
      * Sets the currency used to display currency amounts.  See
      * setCurrency(const char16_t*, UErrorCode&).
      * @deprecated ICU 3.0. Use setCurrency(const char16_t*, UErrorCode&).
      */
     virtual void setCurrency(const char16_t* theCurrency);
+#endif  // U_FORCE_HIDE_DEPRECATED_API
 
     /**
      * Sets the `Currency Usage` object used to display currency.
@@ -2113,22 +2116,6 @@ class U_I18N_API DecimalFormat : public NumberFormat {
     const number::LocalizedNumberFormatter* toNumberFormatter(UErrorCode& status) const;
 #endif  /* U_HIDE_DRAFT_API */
 
-#ifndef U_HIDE_DEPRECATED_API
-    /**
-     * Deprecated: Like {@link #toNumberFormatter(UErrorCode&) const},
-     * but does not take an error code.
-     *
-     * The new signature should be used in case an error occurs while returning the
-     * LocalizedNumberFormatter.
-     *
-     * This old signature will be removed in ICU 65.
-     *
-     * @return A reference to an internal object.
-     * @deprecated ICU 64
-     */
-    const number::LocalizedNumberFormatter& toNumberFormatter() const;
-#endif  /* U_HIDE_DEPRECATED_API */
-
     /**
      * Return the class ID for this class.  This is useful only for
      * comparing to a return value from getDynamicClassID().  For example:
@@ -2216,5 +2203,7 @@ U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif // _DECIMFMT
 //eof