Skip to content

Commit

Permalink
gmock-spec-builders: remove the name for an unused parameter.
Browse files Browse the repository at this point in the history
This fixes unused parameter errors under both MSVC and clang (when
`-Werror=unused-parameter` is used, as reported
[here](9d21db9#r74769946)).

Fixes #3858

PiperOrigin-RevId: 451907906
Change-Id: Ic07da19ea6a547eb1797fbbab19cd57cc2a83fe8
  • Loading branch information
jacobsa authored and Copybara-Service committed May 30, 2022
1 parent 9d21db9 commit e649993
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions googlemock/include/gmock/gmock-spec-builders.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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.
Expand Down

0 comments on commit e649993

Please sign in to comment.