Update ICU to 54.1 step 1

source/i18n/unicode/dcfmtsym.h

 /*
 ********************************************************************************
-*   Copyright (C) 1997-2013, International Business Machines
+*   Copyright (C) 1997-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 ********************************************************************************
 *
 * File DCFMTSYM.H
 *
 * Modification History:
 *
 *   Date        Name        Description
 *   02/19/97    aliu        Converted from java.
 *   03/18/97    clhuang     Updated per C++ implementation.
@@ skipping 142 matching lines @@
          */
         kSevenDigitSymbol,
         /** Eight
          * @stable ICU 4.6
          */
         kEightDigitSymbol,
         /** Nine
          * @stable ICU 4.6
          */
         kNineDigitSymbol,
+        /** Multiplication sign.
+         * @draft ICU 54
+         */
+        kExponentMultiplicationSymbol,
         /** count symbol constants */
         kFormatSymbolCount
     };
 
     /**
      * Create a DecimalFormatSymbols object for the given locale.
      *
      * @param locale    The locale to get symbols for.
      * @param status    Input/output parameter, set to success or
      *                  failure code upon return.
      * @stable ICU 2.0
      */
     DecimalFormatSymbols(const Locale& locale, UErrorCode& status);
 
     /**
      * Create a DecimalFormatSymbols object for the default locale.
      * This constructor will not fail.  If the resource file data is
      * not available, it will use hard-coded last-resort data and
      * set status to U_USING_FALLBACK_ERROR.
      *
      * @param status    Input/output parameter, set to success or
      *                  failure code upon return.
      * @stable ICU 2.0
      */
     DecimalFormatSymbols(UErrorCode& status);
 
-#ifndef U_HIDE_DRAFT_API
     /**
      * Creates a DecimalFormatSymbols object with last-resort data.
      * Intended for callers who cache the symbols data and
      * set all symbols on the resulting object.
      *
      * The last-resort symbols are similar to those for the root data,
      * except that the grouping separators are empty,
      * the NaN symbol is U+FFFD rather than "NaN",
      * and the CurrencySpacing patterns are empty.
      *
      * @param status    Input/output parameter, set to success or
      *                  failure code upon return.
      * @return last-resort symbols
-     * @draft ICU 52
+     * @stable ICU 52
      */
     static DecimalFormatSymbols* createWithLastResortData(UErrorCode& status);
-#endif  /* U_HIDE_DRAFT_API */
 
     /**
      * Copy constructor.
      * @stable ICU 2.0
      */
     DecimalFormatSymbols(const DecimalFormatSymbols&);
 
     /**
      * Assignment operator.
      * @stable ICU 2.0
@@ skipping 125 matching lines @@
     void initialize(const Locale& locale, UErrorCode& success, UBool useLastResortData = FALSE);
 
     /**
      * Initialize the symbols with default values.
      */
     void initialize();
 
     void setCurrencyForSymbols();
 
 public:
-#ifndef U_HIDE_INTERNAL_API
     /**
      * _Internal_ function - more efficient version of getSymbol,
      * returning a const reference to one of the symbol strings.
      * The returned reference becomes invalid when the symbol is changed
      * or when the DecimalFormatSymbols are destroyed.
      * ### TODO markus 2002oct11: Consider proposing getConstSymbol() to be really public.
+     * Note: moved #ifndef U_HIDE_INTERNAL_API after this, since this is needed for inline in DecimalFormat
      *
      * @param symbol Constant to indicate a number format symbol.
      * @return the format symbol by the param 'symbol'
      * @internal
      */
     inline const UnicodeString &getConstSymbol(ENumberFormatSymbol symbol) const;
 
+#ifndef U_HIDE_INTERNAL_API
     /**
      * Returns that pattern stored in currecy info. Internal API for use by NumberFormat API.
      * @internal
      */
     inline const UChar* getCurrencyPattern(void) const;
 #endif  /* U_HIDE_INTERNAL_API */
 
 private:
     /**
      * Private symbol strings.
@@ skipping 34 matching lines @@
 DecimalFormatSymbols::getSymbol(ENumberFormatSymbol symbol) const {
     const UnicodeString *strPtr;
     if(symbol < kFormatSymbolCount) {
         strPtr = &fSymbols[symbol];
     } else {
         strPtr = &fNoSymbol;
     }
     return *strPtr;
 }
 
-#ifndef U_HIDE_INTERNAL_API
-
+//#ifndef U_HIDE_INTERNAL_API
+// See comments above for this function. Not hidden.
 inline const UnicodeString &
 DecimalFormatSymbols::getConstSymbol(ENumberFormatSymbol symbol) const {
     const UnicodeString *strPtr;
     if(symbol < kFormatSymbolCount) {
         strPtr = &fSymbols[symbol];
     } else {
         strPtr = &fNoSymbol;
     }
     return *strPtr;
 }
 
-#endif  /* U_HIDE_INTERNAL_API */
+//#endif  /* U_HIDE_INTERNAL_API */
 
 
 // -------------------------------------
 
 inline void
 DecimalFormatSymbols::setSymbol(ENumberFormatSymbol symbol, const UnicodeString &value, const UBool propogateDigits = TRUE) {
     if(symbol<kFormatSymbolCount) {
         fSymbols[symbol]=value;
     }
 
@@ skipping 23 matching lines @@
     return currPattern;
 }
 #endif /* U_HIDE_INTERNAL_API */
 
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 #endif // _DCFMTSYM
 //eof