summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/libs/icu/TLpatches/patch-15-pow16
-rw-r--r--Build/source/libs/icu/icu-src/source/i18n/plurrule.cpp2
2 files changed, 17 insertions, 1 deletions
diff --git a/Build/source/libs/icu/TLpatches/patch-15-pow b/Build/source/libs/icu/TLpatches/patch-15-pow
new file mode 100644
index 00000000000..39b65e60aa7
--- /dev/null
+++ b/Build/source/libs/icu/TLpatches/patch-15-pow
@@ -0,0 +1,16 @@
+ Else Solaris gets
+libs/icu/icu-src/source/i18n/plurrule.cpp:1884:90:
+error: call of overloaded 'pow(int, const int32_t&)' is ambiguous
+ per https://tug.org/pipermail/tlbuild/2022q1/005020.html.
+
+--- plurrule.cpp (revision 61627)
++++ plurrule.cpp (working copy)
+@@ -1881,7 +1881,7 @@
+
+ double FixedDecimal::getPluralOperand(PluralOperand operand) const {
+ switch(operand) {
+- case PLURAL_OPERAND_N: return (exponent == 0 ? source : source * pow(10, exponent));
++ case PLURAL_OPERAND_N: return (exponent == 0 ? source : source * pow(10.0, exponent));
+ case PLURAL_OPERAND_I: return (double) longValue();
+ case PLURAL_OPERAND_F: return static_cast<double>(decimalDigits);
+ case PLURAL_OPERAND_T: return static_cast<double>(decimalDigitsWithoutTrailingZeros);
diff --git a/Build/source/libs/icu/icu-src/source/i18n/plurrule.cpp b/Build/source/libs/icu/icu-src/source/i18n/plurrule.cpp
index d1918c46981..e6ec5a164a4 100644
--- a/Build/source/libs/icu/icu-src/source/i18n/plurrule.cpp
+++ b/Build/source/libs/icu/icu-src/source/i18n/plurrule.cpp
@@ -1881,7 +1881,7 @@ void FixedDecimal::adjustForMinFractionDigits(int32_t minFractionDigits) {
double FixedDecimal::getPluralOperand(PluralOperand operand) const {
switch(operand) {
- case PLURAL_OPERAND_N: return (exponent == 0 ? source : source * pow(10, exponent));
+ case PLURAL_OPERAND_N: return (exponent == 0 ? source : source * pow(10.0, exponent));
case PLURAL_OPERAND_I: return (double) longValue();
case PLURAL_OPERAND_F: return static_cast<double>(decimalDigits);
case PLURAL_OPERAND_T: return static_cast<double>(decimalDigitsWithoutTrailingZeros);