gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into relocatable-pkgconfig-fix

Browse Source
This commit is contained in:
Gennadiy Civil
2018-10-17 09:51:26 -07:00
committed by GitHub
parent 754cb8ed96 a651a4d44e
commit 2c19680bf9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
googlemock/include/gmock/gmock-spec-builders.h
View File

@@ -1184,9 +1184,10 @@ class TypedExpectation : public ExpectationBase {
Log(kWarning, ss.str(), 1); Log(kWarning, ss.str(), 1);
} }
return count <= action_count ? return count <= action_count
*static_cast<const Action<F>*>(untyped_actions_[count - 1]) : ? *static_cast<const Action<F>*>(
repeated_action(); untyped_actions_[static_cast<size_t>(count - 1)])
: repeated_action();
} }
// Given the arguments of a mock function call, if the call will // Given the arguments of a mock function call, if the call will
@@ -1762,12 +1763,12 @@ class FunctionMockerBase : public UntypedFunctionMockerBase {
::std::ostream* why) const ::std::ostream* why) const
GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) { GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) {
g_gmock_mutex.AssertHeld(); 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 << " " *why << "Google Mock tried the following " << count << " "
<< (count == 1 ? "expectation, but it didn't match" : << (count == 1 ? "expectation, but it didn't match" :
"expectations, but none matched") "expectations, but none matched")
<< ":\n"; << ":\n";
for (int i = 0; i < count; i++) { for (size_t i = 0; i < count; i++) {
TypedExpectation<F>* const expectation = TypedExpectation<F>* const expectation =
static_cast<TypedExpectation<F>*>(untyped_expectations_[i].get()); static_cast<TypedExpectation<F>*>(untyped_expectations_[i].get());
*why << "\n"; *why << "\n";