diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-10-29 13:46:24 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-10-29 13:46:24 -0400 |
| commit | e9085769d4819f8491a5ab19e9e3813144e6aa13 (patch) | |
| tree | 55a2496790bc46370f84234d179db810926a6d95 /googlemock/include/gmock/gmock-spec-builders.h | |
| parent | 80b43d900b8ed44e16b306682d47d73175cecc7f (diff) | |
| parent | 3feffddd1e8381209a48c24587e36e030051499f (diff) | |
| download | googletest-e9085769d4819f8491a5ab19e9e3813144e6aa13.tar.gz googletest-e9085769d4819f8491a5ab19e9e3813144e6aa13.tar.bz2 googletest-e9085769d4819f8491a5ab19e9e3813144e6aa13.zip | |
Merge pull request #1941 from barkovv:master
PiperOrigin-RevId: 219134349
Diffstat (limited to 'googlemock/include/gmock/gmock-spec-builders.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-spec-builders.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h index 7759cb35..c0df5ccb 100644 --- a/googlemock/include/gmock/gmock-spec-builders.h +++ b/googlemock/include/gmock/gmock-spec-builders.h @@ -1904,8 +1904,9 @@ GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251 // second argument is an internal type derived from the method signature. The // failure to disambiguate two overloads of this method in the ON_CALL statement // is how we block callers from setting expectations on overloaded methods. -#define GMOCK_ON_CALL_IMPL_(mock_expr, Setter, call) \ - ((mock_expr).gmock_##call)(::testing::internal::GetWithoutMatchers(), NULL) \ +#define GMOCK_ON_CALL_IMPL_(mock_expr, Setter, call) \ + ((mock_expr).gmock_##call)(::testing::internal::GetWithoutMatchers(), \ + nullptr) \ .Setter(__FILE__, __LINE__, #mock_expr, #call) #define ON_CALL(obj, call) \ |