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

PiperOrigin-RevId: 547250378 Change-Id: I084c30e45f331cb296535822923da1cb7e848e11
1 year ago · cc366710bb
parent 4a1a299b20 3044657e7a
commit cc366710bb
1 changed files with 2 additions and 2 deletions
--- a/googletest/include/gtest/gtest-printers.h
+++ b/googletest/include/gtest/gtest-printers.h
@ -531,7 +531,7 @@ int AppropriateResolution(FloatType val) {
    } 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 @@ int AppropriateResolution(FloatType val) {
    } 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;