External/googletest
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'google:main' into simplify_shouldusecolor

Browse Source
This commit is contained in:
Gaspard Petit 2022-05-30 22:01:15 -04:00 committed by GitHub
commit 3727a90075
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1698,10 +1698,6 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
return std::forward<R>(result);
}
// Disable warnings about an unused parameter (due to SFINAE choosing an
// overload that doesn't use it).
GTEST_DISABLE_MSC_WARNINGS_PUSH_(4100);
// An overload for when it's not possible to print the result. In this case we
// simply perform the action.
template <typename T = R,
@ -1710,12 +1706,10 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
R PerformActionAndPrintResult(const void* const untyped_action,
ArgumentTuple&& args,
const std::string& call_description,
std::ostream& os) {
std::ostream&) {
return PerformAction(untyped_action, std::move(args), call_description);
}
GTEST_DISABLE_MSC_WARNINGS_POP_();
// Returns the result of invoking this mock function with the given
// arguments. This function can be safely called from multiple
// threads concurrently.