summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-03-29 22:42:24 +0000
committerKarl Berry <karl@freefriends.org>2016-03-29 22:42:24 +0000
commite985a1f2ae363f1443ff6980f0861bd15e312162 (patch)
treef440c03e0263b4187e7a109743f7d5a11ae4de72
parenta5ac56eb72589aa41d06cde50b873ba3f37eaf78 (diff)
avoid private enum in classes, for sake of 32-bit MacOSX
git-svn-id: svn://tug.org/texlive/trunk@40179 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/libs/icu/icu-PATCHES/ChangeLog5
-rw-r--r--Build/source/libs/icu/icu-PATCHES/patch-20-private73
-rw-r--r--Build/source/libs/icu/icu-src/source/i18n/dayperiodrules.h2
-rw-r--r--Build/source/libs/icu/icu-src/source/i18n/unicode/dtitvinf.h14
4 files changed, 87 insertions, 7 deletions
diff --git a/Build/source/libs/icu/icu-PATCHES/ChangeLog b/Build/source/libs/icu/icu-PATCHES/ChangeLog
index 1e33c11b9dc..4be9800d1d8 100644
--- a/Build/source/libs/icu/icu-PATCHES/ChangeLog
+++ b/Build/source/libs/icu/icu-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-30 Karl Berry <karl@tug.org>
+
+ * patch-20-private: new file, per Dick Koch.
+ http://tug.org/pipermail/tlbuild/2016q1/003438.html
+
2016-03-27 Karl Berry <karl@tug.org>
* Imported icu-57.1 from
diff --git a/Build/source/libs/icu/icu-PATCHES/patch-20-private b/Build/source/libs/icu/icu-PATCHES/patch-20-private
new file mode 100644
index 00000000000..d20a7de0d37
--- /dev/null
+++ b/Build/source/libs/icu/icu-PATCHES/patch-20-private
@@ -0,0 +1,73 @@
+ The supplied g++-4.2 compiler on 32-bit MacOSX apparently
+ mishandled private enum in the implementation (since newer
+ compilers are ok with it). This can be removed when we drop
+ support for 32-bit MacOSX.
+ 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
+===================================================================
+--- icu-src/source/i18n/dayperiodrules.h (revision 40174)
++++ icu-src/source/i18n/dayperiodrules.h (working copy)
+@@ -53,7 +53,7 @@
+ // Returns the center of dayPeriod. Half hours are indicated with a .5 .
+ double getMidPointForDayPeriod(DayPeriod dayPeriod, UErrorCode &errorCode) const;
+
+-private:
++/* nothing private to placate old compilers --karl/koch private: */
+ DayPeriodRules();
+
+ // Translates "morning1" to DAYPERIOD_MORNING1, for example.
+Index: icu-src/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 @@
+ static UClassID U_EXPORT2 getStaticClassID();
+
+
+-private:
++/* nothing private to placate old compilers --karl/koch private: */
+ /**
+ * DateIntervalFormat will need access to
+ * getBestSkeleton(), parseSkeleton(), enum IntervalPatternIndex,
+@@ -359,7 +360,8 @@
+ kIPI_MAX_INDEX
+ };
+ public:
+-#ifndef U_HIDE_INTERNAL_API
++/* nothing private to placate old compilers --karl/koch */
++/* ifndef U_HIDE_INTERNAL_API */
+ /**
+ * Max index for stored interval patterns
+ * @internal ICU 4.4
+@@ -367,8 +369,8 @@
+ enum {
+ kMaxIntervalPatternIndex = kIPI_MAX_INDEX
+ };
+-#endif /* U_HIDE_INTERNAL_API */
+-private:
++/* endif */ /* U_HIDE_INTERNAL_API */
++/* nothing private to placate old compilers --karl/koch private: */
+
+
+ /**
diff --git a/Build/source/libs/icu/icu-src/source/i18n/dayperiodrules.h b/Build/source/libs/icu/icu-src/source/i18n/dayperiodrules.h
index 5491f7c1ff0..6763ba66a60 100644
--- a/Build/source/libs/icu/icu-src/source/i18n/dayperiodrules.h
+++ b/Build/source/libs/icu/icu-src/source/i18n/dayperiodrules.h
@@ -53,7 +53,7 @@ public:
// Returns the center of dayPeriod. Half hours are indicated with a .5 .
double getMidPointForDayPeriod(DayPeriod dayPeriod, UErrorCode &errorCode) const;
-private:
+/* nothing private to placate old compilers --karl/koch private: */
DayPeriodRules();
// Translates "morning1" to DAYPERIOD_MORNING1, for example.
diff --git a/Build/source/libs/icu/icu-src/source/i18n/unicode/dtitvinf.h b/Build/source/libs/icu/icu-src/source/i18n/unicode/dtitvinf.h
index 2b23dfeaba5..2f209e0b2a2 100644
--- a/Build/source/libs/icu/icu-src/source/i18n/unicode/dtitvinf.h
+++ b/Build/source/libs/icu/icu-src/source/i18n/unicode/dtitvinf.h
@@ -150,7 +150,8 @@ U_NAMESPACE_BEGIN
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 @@ public:
* @internal ICU 4.0
*/
DateIntervalInfo(UErrorCode& status);
-#endif /* U_HIDE_INTERNAL_API */
+/* endif */ /* U_HIDE_INTERNAL_API */
/**
@@ -328,7 +329,7 @@ public:
static UClassID U_EXPORT2 getStaticClassID();
-private:
+/* nothing private to placate old compilers --karl/koch private: */
/**
* DateIntervalFormat will need access to
* getBestSkeleton(), parseSkeleton(), enum IntervalPatternIndex,
@@ -359,7 +360,8 @@ private:
kIPI_MAX_INDEX
};
public:
-#ifndef U_HIDE_INTERNAL_API
+/* nothing private to placate old compilers --karl/koch */
+/* ifndef U_HIDE_INTERNAL_API */
/**
* Max index for stored interval patterns
* @internal ICU 4.4
@@ -367,8 +369,8 @@ public:
enum {
kMaxIntervalPatternIndex = kIPI_MAX_INDEX
};
-#endif /* U_HIDE_INTERNAL_API */
-private:
+/* endif */ /* U_HIDE_INTERNAL_API */
+/* nothing private to placate old compilers --karl/koch private: */
/**