Index: source/i18n/unicode/dcfmtsym.h |
diff --git a/source/i18n/unicode/dcfmtsym.h b/source/i18n/unicode/dcfmtsym.h |
index 0344768b4065b3a3472e38cf688da79b888d82da..dd62a92e420d611e0bbaee63c2de90f198245e83 100644 |
--- a/source/i18n/unicode/dcfmtsym.h |
+++ b/source/i18n/unicode/dcfmtsym.h |
@@ -1,6 +1,6 @@ |
/* |
******************************************************************************** |
-* Copyright (C) 1997-2013, International Business Machines |
+* Copyright (C) 1997-2014, International Business Machines |
* Corporation and others. All Rights Reserved. |
******************************************************************************** |
* |
@@ -163,6 +163,10 @@ public: |
* @stable ICU 4.6 |
*/ |
kNineDigitSymbol, |
+ /** Multiplication sign. |
+ * @draft ICU 54 |
+ */ |
+ kExponentMultiplicationSymbol, |
/** count symbol constants */ |
kFormatSymbolCount |
}; |
@@ -189,7 +193,6 @@ public: |
*/ |
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 |
@@ -203,10 +206,9 @@ public: |
* @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. |
@@ -352,13 +354,13 @@ private: |
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' |
@@ -366,6 +368,7 @@ public: |
*/ |
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 |
@@ -420,8 +423,8 @@ DecimalFormatSymbols::getSymbol(ENumberFormatSymbol symbol) const { |
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; |
@@ -433,7 +436,7 @@ DecimalFormatSymbols::getConstSymbol(ENumberFormatSymbol symbol) const { |
return *strPtr; |
} |
-#endif /* U_HIDE_INTERNAL_API */ |
+//#endif /* U_HIDE_INTERNAL_API */ |
// ------------------------------------- |