diff options
| author | Aralox <pravin1992@gmail.com> | 2020-10-07 18:27:41 +1100 |
|---|---|---|
| committer | Aralox <pravin1992@gmail.com> | 2020-10-07 18:27:41 +1100 |
| commit | ee66065bc54816149aa7f64b9db6dc6845c0c270 (patch) | |
| tree | 1b8bf764f1abfe3007e4258e5d4891b27ece21e0 /googlemock | |
| parent | 1fb1bb23bb8418dc73a5a9a82bbed31dc610fec7 (diff) | |
| download | googletest-ee66065bc54816149aa7f64b9db6dc6845c0c270.tar.gz googletest-ee66065bc54816149aa7f64b9db6dc6845c0c270.zip | |
Issue 2135: Change template args in NiceMock, NaggyMock and StrictMock from A1, A2, ... to TArg1, TArg2,... to avoid clash with legacy header files
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 5495a980..a5579afc 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)); |
