diff options
author | Karl Berry <karl@freefriends.org> | 2022-01-17 22:40:59 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-01-17 22:40:59 +0000 |
commit | d4ee59fc7df7354c717bdb29d4b20855a029b91f (patch) | |
tree | 6aa12660ca84e85b7bdf7672cac651fe7cc09c36 /Build | |
parent | f6e872310c76f0cabbdeb6367c5c2fe30f3c4b3c (diff) |
try pow(10.0,...) to avoid "call of overloaded 'pow(int, const int32_t&)' is ambiguous", per mojca
git-svn-id: svn://tug.org/texlive/trunk@61640 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-15-pow | 16 | ||||
-rw-r--r-- | Build/source/libs/icu/icu-src/source/i18n/plurrule.cpp | 2 |
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); |