Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/google/googletest.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Jacobs <jacobsa@google.com>2022-05-30 22:46:29 +0300
committerCopybara-Service <copybara-worker@google.com>2022-05-30 22:46:59 +0300
commite649993a402d96afe25fbf3413749adf0f2947f6 (patch)
tree0ec445a01137148d13e1d50179c5acc4ed0e4ba4 /googlemock
parent9d21db9e0a60a1ea61ec19331c9bc0dd33e907b1 (diff)
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
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/include/gmock/gmock-spec-builders.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h
index fd12a067..b2911bfc 100644
--- a/googlemock/include/gmock/gmock-spec-builders.h
+++ b/googlemock/include/gmock/gmock-spec-builders.h
@@ -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.