diff options
| author | Derek Mauro <dmauro@google.com> | 2020-10-15 17:32:33 (GMT) |
|---|---|---|
| committer | Derek Mauro <dmauro@google.com> | 2020-10-15 17:32:33 (GMT) |
| commit | ebbeee39f5f97d15799d239344b01b12f3025ba6 (patch) | |
| tree | 994f52320f121710a3ab942b310dbdeeb93bb0d4 /googlemock | |
| parent | a4621888650aaae118de93f9faf8ef5a18cab303 (diff) | |
| parent | ee66065bc54816149aa7f64b9db6dc6845c0c270 (diff) | |
| download | googletest-ebbeee39f5f97d15799d239344b01b12f3025ba6.zip googletest-ebbeee39f5f97d15799d239344b01b12f3025ba6.tar.gz googletest-ebbeee39f5f97d15799d239344b01b12f3025ba6.tar.bz2 | |
Merge pull request #3042 from Aralox:Issue-2135-modify-mock-template-args-AX-to-TArgX
PiperOrigin-RevId: 337217118
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/include/gmock/gmock-nice-strict.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/googlemock/include/gmock/gmock-nice-strict.h b/googlemock/include/gmock/gmock-nice-strict.h index 5495a98..a5579af 100644 --- a/googlemock/include/gmock/gmock-nice-strict.h +++ b/googlemock/include/gmock/gmock-nice-strict.h @@ -89,9 +89,9 @@ class NiceMock : public MockClass { internal::ImplicitCast_<MockClass*>(this)); } - template <typename A1, typename A2, typename... An> - NiceMock(A1&& arg1, A2&& arg2, An&&... args) - : MockClass(std::forward<A1>(arg1), std::forward<A2>(arg2), + template <typename TArg1, typename TArg2, typename... An> + NiceMock(TArg1&& arg1, TArg2&& arg2, An&&... args) + : MockClass(std::forward<TArg1>(arg1), std::forward<TArg2>(arg2), std::forward<An>(args)...) { ::testing::Mock::AllowUninterestingCalls( internal::ImplicitCast_<MockClass*>(this)); @@ -127,9 +127,9 @@ class NaggyMock : public MockClass { internal::ImplicitCast_<MockClass*>(this)); } - template <typename A1, typename A2, typename... An> - NaggyMock(A1&& arg1, A2&& arg2, An&&... args) - : MockClass(std::forward<A1>(arg1), std::forward<A2>(arg2), + template <typename TArg1, typename TArg2, typename... An> + NaggyMock(TArg1&& arg1, TArg2&& arg2, An&&... args) + : MockClass(std::forward<TArg1>(arg1), std::forward<TArg2>(arg2), std::forward<An>(args)...) { ::testing::Mock::WarnUninterestingCalls( internal::ImplicitCast_<MockClass*>(this)); @@ -165,9 +165,9 @@ class StrictMock : public MockClass { internal::ImplicitCast_<MockClass*>(this)); } - template <typename A1, typename A2, typename... An> - StrictMock(A1&& arg1, A2&& arg2, An&&... args) - : MockClass(std::forward<A1>(arg1), std::forward<A2>(arg2), + template <typename TArg1, typename TArg2, typename... An> + StrictMock(TArg1&& arg1, TArg2&& arg2, An&&... args) + : MockClass(std::forward<TArg1>(arg1), std::forward<TArg2>(arg2), std::forward<An>(args)...) { ::testing::Mock::FailUninterestingCalls( internal::ImplicitCast_<MockClass*>(this)); |