commit 3b26f7e53bbe287deb57c75c796f17c9a82229a1
author Krzysztof Kosiński <krzysio@google.com> Tue Jan 09 08:38:41 2024 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Jan 09 08:39:28 2024 -0800
tree e5dd756807f1d94c73da79e7f0e6ea7480249c31
parent dddb219c3eb96d7f9200f09b0a381f016e6b4562

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

googletest/include/gtest/gtest-printers.h

diff --git a/googletest/include/gtest/gtest-printers.h b/googletest/include/gtest/gtest-printers.h
index 1b12ef6..0007a2a 100644
--- a/googletest/include/gtest/gtest-printers.h
+++ b/googletest/include/gtest/gtest-printers.h
@@ -552,6 +552,10 @@
   int full = std::numeric_limits<FloatType>::max_digits10;
   if (val < 0) val = -val;
 
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
   if (val < 1000000) {
     FloatType mulfor6 = 1e10;
     if (val >= 100000.0) {  // 100,000 to 999,999
@@ -595,6 +599,9 @@
         val)
       return 6;
   }
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
   return full;
 }