ICU-66108.tar.gz

[apple/icu.git] / icuSources / i18n / reldtfmt.h

diff --git a/icuSources/i18n/reldtfmt.h b/icuSources/i18n/reldtfmt.h
index 48c0f27ef4fb2578a280882e7fb410fb7e196b96..e914fab6bc2a2a3a4273b862ec352af77803835a 100644 (file)
--- a/icuSources/i18n/reldtfmt.h
+++ b/icuSources/i18n/reldtfmt.h
@@ -1,3 +1,5 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 *******************************************************************************
 * Copyright (C) 2007-2016, International Business Machines Corporation and    *
@@ -69,7 +71,7 @@ public:
      * @return    A copy of the object.
      * @internal ICU 3.8
      */
-    virtual Format* clone(void) const;
+    virtual RelativeDateFormat* clone() const;
 
     /**
      * Return true if the given Format objects are semantically equal. Objects
@@ -233,7 +235,6 @@ public:
      */
     virtual const DateFormatSymbols* getDateFormatSymbols(void) const;
 
-    /* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */
     /**
      * Set a particular UDisplayContext value in the formatter, such as
      * UDISPCTX_CAPITALIZATION_FOR_STANDALONE. Note: For getContext, see
@@ -255,8 +256,6 @@ private:
     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 +263,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.
@@ -350,4 +353,3 @@ U_NAMESPACE_END
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 #endif // RELDTFMT_H
-//eof