mirror of
https://github.com/google/googletest.git
synced 2024-12-27 02:01:25 +08:00
Disable -Wfloat-equal in AppropriateResolution().
This function makes exact floating point that are correct in this context, but trigger the compiler warning. PiperOrigin-RevId: 596944060 Change-Id: I4bba3c2abcf3ac189107530978961955ad47d6f0
This commit is contained in:
parent
dddb219c3e
commit
3b26f7e53b
@ -552,6 +552,10 @@ int AppropriateResolution(FloatType val) {
|
|||||||
int full = std::numeric_limits<FloatType>::max_digits10;
|
int full = std::numeric_limits<FloatType>::max_digits10;
|
||||||
if (val < 0) val = -val;
|
if (val < 0) val = -val;
|
||||||
|
|
||||||
|
#ifdef __GNUC__
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wfloat-equal"
|
||||||
|
#endif
|
||||||
if (val < 1000000) {
|
if (val < 1000000) {
|
||||||
FloatType mulfor6 = 1e10;
|
FloatType mulfor6 = 1e10;
|
||||||
if (val >= 100000.0) { // 100,000 to 999,999
|
if (val >= 100000.0) { // 100,000 to 999,999
|
||||||
@ -595,6 +599,9 @@ int AppropriateResolution(FloatType val) {
|
|||||||
val)
|
val)
|
||||||
return 6;
|
return 6;
|
||||||
}
|
}
|
||||||
|
#ifdef __GNUC__
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
|
#endif
|
||||||
return full;
|
return full;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user