Googletest export

Fix undefined pointer comparison

PiperOrigin-RevId: 334436975

diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc
index 0764f2eb4363a10b934fa54834cde8bd4d7318b5..9c54b81ff0b181b5a1720548a57d634f6f95c36e 100644 (file)
--- a/googletest/src/gtest-death-test.cc
+++ b/googletest/src/gtest-death-test.cc
@@ -32,6 +32,7 @@
 
 #include "gtest/gtest-death-test.h"
 
+#include <functional>
 #include <utility>
 
 #include "gtest/internal/gtest-port.h"
@@ -1282,7 +1283,7 @@ GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
 GTEST_ATTRIBUTE_NO_SANITIZE_HWADDRESS_
 static void StackLowerThanAddress(const void* ptr, bool* result) {
   int dummy = 0;
-  *result = (&dummy < ptr);
+  *result = std::less<const void*>()(&dummy, ptr);
 }
 
 // Make sure AddressSanitizer does not tamper with the stack here.