diff options
author | Gaspard Petit <gaspardpetit@gmail.com> | 2022-05-31 02:01:15 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-31 02:01:15 (GMT) |
commit | 3727a9007512507e247fdab69c62e039f29ff80b (patch) | |
tree | 8d1a22c3a4ad5d767d514c7e833d49bf4f603e4c | |
parent | 59006287cd4f8c239eaa0f23852eef2b57d93da3 (diff) | |
parent | e649993a402d96afe25fbf3413749adf0f2947f6 (diff) | |
download | googletest-3727a9007512507e247fdab69c62e039f29ff80b.zip googletest-3727a9007512507e247fdab69c62e039f29ff80b.tar.gz googletest-3727a9007512507e247fdab69c62e039f29ff80b.tar.bz2 |
Merge branch 'google:main' into simplify_shouldusecolorrefs/pull/3866/head
-rw-r--r-- | googlemock/include/gmock/gmock-spec-builders.h | 8 |
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 fd12a06..b2911bf 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. |