diff options
author | Abseil Team <absl-team@google.com> | 2019-11-20 19:36:06 (GMT) |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2019-11-22 21:33:15 (GMT) |
commit | 717ce7feb87278b81dad756d973693024621f8e8 (patch) | |
tree | 2c016351f4359b94f75fa2af762d2138998d8063 /googlemock/test/gmock-matchers_test.cc | |
parent | 200ff599496e20f4e39566feeaf2f6734ca7570f (diff) | |
download | googletest-717ce7feb87278b81dad756d973693024621f8e8.zip googletest-717ce7feb87278b81dad756d973693024621f8e8.tar.gz googletest-717ce7feb87278b81dad756d973693024621f8e8.tar.bz2 |
Googletest export
Use standard C++11 integer types in gtest-port.h.
Remove testing::internal::{Int,Uint}{32,64} in favor of types
guaranteed to be in <cstdint> since C++11.
Tests for built-in integer type coverage are switched from
{Int,Uint}64 to [unsigned] long long, which is guaranteed by
C++11 to exist and be at least 64-bit wide.
PiperOrigin-RevId: 281565263
Diffstat (limited to 'googlemock/test/gmock-matchers_test.cc')
-rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index bc49cb6..c2c3abd 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -46,6 +46,7 @@ #include <time.h> #include <array> +#include <cstdint> #include <deque> #include <forward_list> #include <functional> @@ -6028,9 +6029,9 @@ TEST_P(BipartiteRandomTest, LargerNets) { int iters = GetParam().second; MatchMatrix graph(static_cast<size_t>(nodes), static_cast<size_t>(nodes)); - auto seed = static_cast<testing::internal::UInt32>(GTEST_FLAG(random_seed)); + auto seed = static_cast<uint32_t>(GTEST_FLAG(random_seed)); if (seed == 0) { - seed = static_cast<testing::internal::UInt32>(time(nullptr)); + seed = static_cast<uint32_t>(time(nullptr)); } for (; iters > 0; --iters, ++seed) { |