diff options
| author | vslashg <gfalcon@google.com> | 2019-11-01 20:02:16 (GMT) |
|---|---|---|
| committer | vslashg <gfalcon@google.com> | 2019-11-01 20:02:16 (GMT) |
| commit | e8a82dc7ede61c4af3b9d75aa0e953b8cecfc8bb (patch) | |
| tree | 2c85a4c08b20e6ce31a4c5e1f8814d9b837a94bd /googletest/test/gtest_unittest.cc | |
| parent | 057ee5063d00a67fd0a83029e8cf26ea9bc1bb69 (diff) | |
| parent | 6e87238c9b14bcd749364e9b7125622a985a8a20 (diff) | |
| download | googletest-e8a82dc7ede61c4af3b9d75aa0e953b8cecfc8bb.zip googletest-e8a82dc7ede61c4af3b9d75aa0e953b8cecfc8bb.tar.gz googletest-e8a82dc7ede61c4af3b9d75aa0e953b8cecfc8bb.tar.bz2 | |
Merge pull request #2453 from kuzkry:gtest-port-clean-up_kMaxBiggestInt
PiperOrigin-RevId: 277979766
Diffstat (limited to 'googletest/test/gtest_unittest.cc')
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index d17a155..ae8834d 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -55,11 +55,11 @@ TEST(CommandLineFlagsTest, CanBeAccessedInCodeOnceGTestHIsIncluded) { EXPECT_TRUE(dummy || !dummy); // Suppresses warning that dummy is unused. } -#include <limits.h> // For INT_MAX. #include <stdlib.h> #include <string.h> #include <time.h> +#include <limits> #include <map> #include <ostream> #include <type_traits> @@ -3952,11 +3952,11 @@ enum { // On Linux, kCaseB and kCaseA have the same value when truncated to // int size. We want to test whether this will confuse the // assertions. - kCaseB = testing::internal::kMaxBiggestInt, + kCaseB = (std::numeric_limits<std::intmax_t>::max)(), # else - kCaseB = INT_MAX, + kCaseB = (std::numeric_limits<int>::max)(), # endif // GTEST_OS_LINUX |