more 10.0 to placate C++

git-svn-id: svn://tug.org/texlive/trunk@61655 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 31 insertions, 4 deletions

diff --git a/Build/source/libs/icu/TLpatches/patch-15-pow b/Build/source/libs/icu/TLpatches/patch-15-pow
index 39b65e60aa7..cb410d0e99b 100644
--- a/Build/source/libs/icu/TLpatches/patch-15-pow
+++ b/Build/source/libs/icu/TLpatches/patch-15-pow
@@ -2,9 +2,19 @@
 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.
+	-> https://github.com/unicode-org/icu/pull/1961
 
---- plurrule.cpp	(revision 61627)
+--- plurrule.cpp	(revision 61625)
 +++ plurrule.cpp	(working copy)
+@@ -1628,7 +1628,7 @@
+     init(n, v, f, e);
+     // check values. TODO make into unit test.
+     //            
+-    //            long visiblePower = (int) Math.pow(10, v);
++    //            long visiblePower = (int) Math.pow(10.0, v);
+     //            if (decimalDigits > visiblePower) {
+     //                throw new IllegalArgumentException();
+     //            }
 @@ -1881,7 +1881,7 @@
  
  double FixedDecimal::getPluralOperand(PluralOperand operand) const {
@@ -14,3 +24,20 @@ error: call of overloaded 'pow(int, const int32_t&)' is ambiguous
          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);
+@@ -1932,14 +1932,14 @@
+ }
+ 
+ double FixedDecimal::doubleValue() const {
+-    return (isNegative ? -source : source) * pow(10, exponent);
++    return (isNegative ? -source : source) * pow(10.0, exponent);
+ }
+ 
+ int64_t FixedDecimal::longValue() const {
+     if (exponent == 0) {
+         return intValue;
+     } else {
+-        return (long) (pow(10, exponent) * intValue);
++        return (long) (pow(10.0, exponent) * intValue);
+     }
+ }
+ 
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 e6ec5a164a4..336292c5458 100644
--- a/Build/source/libs/icu/icu-src/source/i18n/plurrule.cpp
+++ b/Build/source/libs/icu/icu-src/source/i18n/plurrule.cpp
@@ -1628,7 +1628,7 @@ FixedDecimal::FixedDecimal(double n, int32_t v, int64_t f, int32_t e) {
     init(n, v, f, e);
     // check values. TODO make into unit test.
     //            
-    //            long visiblePower = (int) Math.pow(10, v);
+    //            long visiblePower = (int) Math.pow(10.0, v);
     //            if (decimalDigits > visiblePower) {
     //                throw new IllegalArgumentException();
     //            }
@@ -1932,14 +1932,14 @@ UnicodeString FixedDecimal::toString() const {
 }
 
 double FixedDecimal::doubleValue() const {
-    return (isNegative ? -source : source) * pow(10, exponent);
+    return (isNegative ? -source : source) * pow(10.0, exponent);
 }
 
 int64_t FixedDecimal::longValue() const {
     if (exponent == 0) {
         return intValue;
     } else {
-        return (long) (pow(10, exponent) * intValue);
+        return (long) (pow(10.0, exponent) * intValue);
     }
 }