commit cc366710bbf40a9816d47c35802d06dbaccb8792
author Copybara-Service <copybara-worker@google.com> Tue Jul 11 11:37:29 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Jul 11 11:37:29 2023 -0700
tree 517475822a761a2856cd4773d503d5ff365e3283
parent 4a1a299b206ba250a4318f74938ea67c75c3c0c9
parent 3044657e7afa759ce875a8161cd4bff0fd2e22bc

Merge pull request #4308 from smr99:fix-float-cast

PiperOrigin-RevId: 547250378
Change-Id: I084c30e45f331cb296535822923da1cb7e848e11

googletest/include/gtest/gtest-printers.h

diff --git a/googletest/include/gtest/gtest-printers.h b/googletest/include/gtest/gtest-printers.h
index bcdecd1..1ba5178 100644
--- a/googletest/include/gtest/gtest-printers.h
+++ b/googletest/include/gtest/gtest-printers.h
@@ -531,7 +531,7 @@
     } else if (val >= 0.0001) {
       mulfor6 = 1e9;
     }
-    if (static_cast<float>(static_cast<int32_t>(val * mulfor6 + 0.5)) /
+    if (static_cast<FloatType>(static_cast<int32_t>(val * mulfor6 + 0.5)) /
             mulfor6 ==
         val)
       return 6;
@@ -546,7 +546,7 @@
     } else if (val >= 1e6) {  // 1,000,000 to 9,999,999
       divfor6 = 10;
     }
-    if (static_cast<float>(static_cast<int32_t>(val / divfor6 + 0.5)) *
+    if (static_cast<FloatType>(static_cast<int32_t>(val / divfor6 + 0.5)) *
             divfor6 ==
         val)
       return 6;