diff options
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 8 | ||||
| -rw-r--r-- | googletest/include/gtest/internal/gtest-internal.h | 2 | ||||
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 696f9e8..13a4671 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -2980,7 +2980,7 @@ auto UnpackStruct(const T& t) // The array ensures left-to-right order of evaluation. // Usage: VariadicExpand({expr...}); template <typename T, size_t N> -void VariadicExpand(const T (&a)[N]) {} +void VariadicExpand(const T (&)[N]) {} template <typename Struct, typename StructSize> class FieldsAreMatcherImpl; @@ -3029,13 +3029,13 @@ class FieldsAreMatcherImpl<Struct, IndexSequence<I...>> return good; } - int failed_pos = -1; + size_t failed_pos = ~size_t{}; std::vector<StringMatchResultListener> inner_listener(sizeof...(I)); VariadicExpand( - {failed_pos == -1 && !std::get<I>(matchers_).MatchAndExplain( - std::get<I>(tuple), &inner_listener[I]) + {failed_pos == ~size_t{} && !std::get<I>(matchers_).MatchAndExplain( + std::get<I>(tuple), &inner_listener[I]) ? failed_pos = I : 0 ...}); if (failed_pos != ~size_t{}) { diff --git a/googletest/include/gtest/internal/gtest-internal.h b/googletest/include/gtest/internal/gtest-internal.h index 0500dea..d990c0f 100644 --- a/googletest/include/gtest/internal/gtest-internal.h +++ b/googletest/include/gtest/internal/gtest-internal.h @@ -287,7 +287,7 @@ class FloatingPoint { // // See the following article for more details on ULP: // http://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/ - static const size_t kMaxUlps = 4; + static const uint32_t kMaxUlps = 4; // Constructs a FloatingPoint from a raw floating-point number. // diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index 140395f..56bfa8c 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -2768,7 +2768,7 @@ class FloatingPointTest : public Test { typedef typename Floating::Bits Bits; void SetUp() override { - const size_t max_ulps = Floating::kMaxUlps; + const uint32_t max_ulps = Floating::kMaxUlps; // The bits that represent 0.0. const Bits zero_bits = Floating(0).bits(); |