diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-10-17 09:51:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-17 09:51:26 -0700 |
| commit | 2c19680bf99dbab41f08b4d39f401486d3a74d06 (patch) | |
| tree | 4b2d0d76fae6a9709ba91a150028c5669f8bc451 | |
| parent | 754cb8ed9643cf8f2c82635ae43b1b9329f846da (diff) | |
| parent | a651a4d44e65b749467fa3dddf93819a22f0cc4a (diff) | |
| download | googletest-2c19680bf99dbab41f08b4d39f401486d3a74d06.tar.gz googletest-2c19680bf99dbab41f08b4d39f401486d3a74d06.tar.bz2 googletest-2c19680bf99dbab41f08b4d39f401486d3a74d06.zip | |
Merge branch 'master' into relocatable-pkgconfig-fix
| -rw-r--r-- | googlemock/include/gmock/gmock-spec-builders.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h index c8e864cc..b98e48b4 100644 --- a/googlemock/include/gmock/gmock-spec-builders.h +++ b/googlemock/include/gmock/gmock-spec-builders.h @@ -1184,9 +1184,10 @@ class TypedExpectation : public ExpectationBase { Log(kWarning, ss.str(), 1); } - return count <= action_count ? - *static_cast<const Action<F>*>(untyped_actions_[count - 1]) : - repeated_action(); + return count <= action_count + ? *static_cast<const Action<F>*>( + untyped_actions_[static_cast<size_t>(count - 1)]) + : repeated_action(); } // Given the arguments of a mock function call, if the call will @@ -1762,12 +1763,12 @@ class FunctionMockerBase : public UntypedFunctionMockerBase { ::std::ostream* why) const GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) { g_gmock_mutex.AssertHeld(); - const int count = static_cast<int>(untyped_expectations_.size()); + const size_t count = untyped_expectations_.size(); *why << "Google Mock tried the following " << count << " " << (count == 1 ? "expectation, but it didn't match" : "expectations, but none matched") << ":\n"; - for (int i = 0; i < count; i++) { + for (size_t i = 0; i < count; i++) { TypedExpectation<F>* const expectation = static_cast<TypedExpectation<F>*>(untyped_expectations_[i].get()); *why << "\n"; |