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

gmock-spec-builders: remove the name for an unused parameter.

Browse Source 
This fixes unused parameter errors under both MSVC and clang (when
`-Werror=unused-parameter` is used, as reported
[here](9d21db9e0a (r74769946))).

Fixes #3858

PiperOrigin-RevId: 451907906
Change-Id: Ic07da19ea6a547eb1797fbbab19cd57cc2a83fe8
This commit is contained in:
Aaron Jacobs
2022-05-30 12:46:29 -07:00
committed by Copybara-Service
parent 9d21db9e0a
commit e649993a40
1 changed files with 1 additions and 7 deletions
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); 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 // An overload for when it's not possible to print the result. In this case we
// simply perform the action. // simply perform the action.
template <typename T = R, template <typename T = R,
@@ -1710,12 +1706,10 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
R PerformActionAndPrintResult(const void* const untyped_action, R PerformActionAndPrintResult(const void* const untyped_action,
ArgumentTuple&& args, ArgumentTuple&& args,
const std::string& call_description, const std::string& call_description,
std::ostream& os) { std::ostream&) {
return PerformAction(untyped_action, std::move(args), call_description); 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 // Returns the result of invoking this mock function with the given
// arguments. This function can be safely called from multiple // arguments. This function can be safely called from multiple
// threads concurrently. // threads concurrently.