From: dmauro <dmauro@google.com>
Date: Tue, 29 Sep 2020 19:27:38 +0000 (-0400)
Subject: Googletest export
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=477998eefac3d55831e7f3974671ba22b8739b93;p=googletest.git

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 0764f2e..9c54b81 100644
--- 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.