Skip to content

G
googletest
Commit ebbeee39 by Derek Mauro
Options

Merge pull request #3042 from Aralox:Issue-2135-modify-mock-template-args-AX-to-TArgX

PiperOrigin-RevId: 337217118
parents a4621888 ee66065b
Showing with 9 additions and 9 deletions
googlemock/include/gmock/gmock-nice-strict.h
...@@ -89,9 +89,9 @@ class NiceMock : public MockClass { ...@@ -89,9 +89,9 @@ class NiceMock : public MockClass {
internal::ImplicitCast_<MockClass*>(this)); internal::ImplicitCast_<MockClass*>(this));
} }
template <typename A1, typename A2, typename... An> template <typename TArg1, typename TArg2, typename... An>
NiceMock(A1&& arg1, A2&& arg2, An&&... args) NiceMock(TArg1&& arg1, TArg2&& arg2, An&&... args)
: MockClass(std::forward<A1>(arg1), std::forward<A2>(arg2), : MockClass(std::forward<TArg1>(arg1), std::forward<TArg2>(arg2),
std::forward<An>(args)...) { std::forward<An>(args)...) {
::testing::Mock::AllowUninterestingCalls( ::testing::Mock::AllowUninterestingCalls(
internal::ImplicitCast_<MockClass*>(this)); internal::ImplicitCast_<MockClass*>(this));
...@@ -127,9 +127,9 @@ class NaggyMock : public MockClass { ...@@ -127,9 +127,9 @@ class NaggyMock : public MockClass {
internal::ImplicitCast_<MockClass*>(this)); internal::ImplicitCast_<MockClass*>(this));
} }
template <typename A1, typename A2, typename... An> template <typename TArg1, typename TArg2, typename... An>
NaggyMock(A1&& arg1, A2&& arg2, An&&... args) NaggyMock(TArg1&& arg1, TArg2&& arg2, An&&... args)
: MockClass(std::forward<A1>(arg1), std::forward<A2>(arg2), : MockClass(std::forward<TArg1>(arg1), std::forward<TArg2>(arg2),
std::forward<An>(args)...) { std::forward<An>(args)...) {
::testing::Mock::WarnUninterestingCalls( ::testing::Mock::WarnUninterestingCalls(
internal::ImplicitCast_<MockClass*>(this)); internal::ImplicitCast_<MockClass*>(this));
...@@ -165,9 +165,9 @@ class StrictMock : public MockClass { ...@@ -165,9 +165,9 @@ class StrictMock : public MockClass {
internal::ImplicitCast_<MockClass*>(this)); internal::ImplicitCast_<MockClass*>(this));
} }
template <typename A1, typename A2, typename... An> template <typename TArg1, typename TArg2, typename... An>
StrictMock(A1&& arg1, A2&& arg2, An&&... args) StrictMock(TArg1&& arg1, TArg2&& arg2, An&&... args)
: MockClass(std::forward<A1>(arg1), std::forward<A2>(arg2), : MockClass(std::forward<TArg1>(arg1), std::forward<TArg2>(arg2),
std::forward<An>(args)...) { std::forward<An>(args)...) {
::testing::Mock::FailUninterestingCalls( ::testing::Mock::FailUninterestingCalls(
internal::ImplicitCast_<MockClass*>(this)); internal::ImplicitCast_<MockClass*>(this));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment