Commit e649993a authored by Aaron Jacobs's avatar Aaron Jacobs Committed by Copybara-Service
Browse files

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

This fixes unused parameter errors under both MSVC and clang (when
`-Werror=unused-parameter` is used, as reported
[here](https://github.com/google/googletest/commit/9d21db9e0a60a1ea61ec19331c9bc0dd33e907b1#r74769946)).

Fixes #3858

PiperOrigin-RevId: 451907906
Change-Id: Ic07da19ea6a547eb1797fbbab19cd57cc2a83fe8
parent 9d21db9e
......@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment