eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change types to remove cast warnings.

Browse Source
This commit is contained in:
Robert Woldberg 2018-10-12 11:12:55 -06:00
parent 589e55433e
commit 2e8ddd72be
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1185,7 +1185,7 @@ class TypedExpectation : public ExpectationBase {
} }
return count <= action_count ? return count <= action_count ?
*static_cast<const Action<F>*>(untyped_actions_[count - 1]) : *static_cast<const Action<F>*>(untyped_actions_[static_cast<size_t>(count - 1)]) :
repeated_action(); repeated_action();
} }
@ -1762,12 +1762,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";