Index: source/i18n/reldtfmt.h |
diff --git a/source/i18n/reldtfmt.h b/source/i18n/reldtfmt.h |
index 67539e043b29446f4984252286bd692c16fd4917..3a11dfb150debc3691d853ccbe66ec9757b0c020 100644 |
--- a/source/i18n/reldtfmt.h |
+++ b/source/i18n/reldtfmt.h |
@@ -1,6 +1,8 @@ |
+// Copyright (C) 2016 and later: Unicode, Inc. and others. |
+// License & terms of use: http://www.unicode.org/copyright.html |
/* |
******************************************************************************* |
-* Copyright (C) 2007-2014, International Business Machines Corporation and * |
+* Copyright (C) 2007-2016, International Business Machines Corporation and * |
* others. All Rights Reserved. * |
******************************************************************************* |
*/ |
@@ -25,7 +27,7 @@ U_NAMESPACE_BEGIN |
// forward declarations |
class DateFormatSymbols; |
-class MessageFormat; |
+class SimpleFormatter; |
// internal structure used for caching strings |
struct URelativeString; |
@@ -250,13 +252,11 @@ private: |
SimpleDateFormat *fDateTimeFormatter; |
UnicodeString fDatePattern; |
UnicodeString fTimePattern; |
- MessageFormat *fCombinedFormat; // the {0} {1} format. |
+ SimpleFormatter *fCombinedFormat; // the {0} {1} format. |
UDateFormatStyle fDateStyle; |
Locale fLocale; |
- int32_t fDayMin; // day id of lowest # |
- int32_t fDayMax; // day id of highest # |
int32_t fDatesLen; // Length of array |
URelativeString *fDates; // array of strings |
@@ -264,7 +264,11 @@ private: |
UBool fCapitalizationInfoSet; |
UBool fCapitalizationOfRelativeUnitsForUIListMenu; |
UBool fCapitalizationOfRelativeUnitsForStandAlone; |
+#if !UCONFIG_NO_BREAK_ITERATION |
BreakIterator* fCapitalizationBrkIter; |
+#else |
+ UObject* fCapitalizationBrkIter; |
+#endif |
/** |
* Get the string at a specific offset. |
@@ -333,4 +337,3 @@ U_NAMESPACE_END |
#endif /* #if !UCONFIG_NO_FORMATTING */ |
#endif // RELDTFMT_H |
-//eof |