diff options
Diffstat (limited to 'Build/source/libs/icu/TLpatches/patch-20-private')
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-20-private | 39 |
1 files changed, 10 insertions, 29 deletions
diff --git a/Build/source/libs/icu/TLpatches/patch-20-private b/Build/source/libs/icu/TLpatches/patch-20-private index d20a7de0d37..ec7ade078de 100644 --- a/Build/source/libs/icu/TLpatches/patch-20-private +++ b/Build/source/libs/icu/TLpatches/patch-20-private @@ -5,11 +5,11 @@ http://tug.org/pipermail/tlbuild/2016q1/003438.html (and starting at http://tug.org/pipermail/tlbuild/2016q1/003433.html) -Index: icu-src/source/i18n/dayperiodrules.h +Index: source/i18n/dayperiodrules.h =================================================================== ---- icu-src/source/i18n/dayperiodrules.h (revision 40174) -+++ icu-src/source/i18n/dayperiodrules.h (working copy) -@@ -53,7 +53,7 @@ +--- source/i18n/dayperiodrules.h (revision 43491) ++++ source/i18n/dayperiodrules.h (working copy) +@@ -55,7 +55,7 @@ // Returns the center of dayPeriod. Half hours are indicated with a .5 . double getMidPointForDayPeriod(DayPeriod dayPeriod, UErrorCode &errorCode) const; @@ -18,30 +18,11 @@ Index: icu-src/source/i18n/dayperiodrules.h DayPeriodRules(); // Translates "morning1" to DAYPERIOD_MORNING1, for example. -Index: icu-src/source/i18n/unicode/dtitvinf.h +Index: source/i18n/unicode/dtitvinf.h =================================================================== ---- icu-src/source/i18n/unicode/dtitvinf.h (revision 40174) -+++ icu-src/source/i18n/unicode/dtitvinf.h (working copy) -@@ -150,7 +150,8 @@ - - class U_I18N_API DateIntervalInfo U_FINAL : public UObject { - public: --#ifndef U_HIDE_INTERNAL_API -+/* nothing private to placate old compilers --karl/koch */ -+/* ifndef U_HIDE_INTERNAL_API */ - /** - * Default constructor. - * It does not initialize any interval patterns except -@@ -165,7 +166,7 @@ - * @internal ICU 4.0 - */ - DateIntervalInfo(UErrorCode& status); --#endif /* U_HIDE_INTERNAL_API */ -+/* endif */ /* U_HIDE_INTERNAL_API */ - - - /** -@@ -328,7 +329,7 @@ +--- source/i18n/unicode/dtitvinf.h (revision 43491) ++++ source/i18n/unicode/dtitvinf.h (working copy) +@@ -330,7 +330,7 @@ static UClassID U_EXPORT2 getStaticClassID(); @@ -50,7 +31,7 @@ Index: icu-src/source/i18n/unicode/dtitvinf.h /** * DateIntervalFormat will need access to * getBestSkeleton(), parseSkeleton(), enum IntervalPatternIndex, -@@ -359,7 +360,8 @@ +@@ -364,7 +364,8 @@ kIPI_MAX_INDEX }; public: @@ -60,7 +41,7 @@ Index: icu-src/source/i18n/unicode/dtitvinf.h /** * Max index for stored interval patterns * @internal ICU 4.4 -@@ -367,8 +369,8 @@ +@@ -372,8 +373,8 @@ enum { kMaxIntervalPatternIndex = kIPI_MAX_INDEX }; |