]> git-server-git.apps.pok.os.sepia.ceph.com Git - googletest.git/commitdiff
gmock-spec-builders: remove the name for an unused parameter.
authorAaron Jacobs <jacobsa@google.com>
Mon, 30 May 2022 19:46:29 +0000 (12:46 -0700)
committerCopybara-Service <copybara-worker@google.com>
Mon, 30 May 2022 19:46:59 +0000 (12:46 -0700)
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

googlemock/include/gmock/gmock-spec-builders.h

index fd12a06720dfe1be17d17fccc7f4a7a57a029a58..b2911bfc7ce58a0a901cadd79e2a8ed29b02c1ea 100644 (file)
@@ -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.