mirror of
https://github.com/google/googletest.git
synced 2024-12-26 09:31:02 +08:00
Merge pull request #4308 from smr99:fix-float-cast
PiperOrigin-RevId: 547250378 Change-Id: I084c30e45f331cb296535822923da1cb7e848e11
This commit is contained in:
commit
cc366710bb
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user