diff options
| author | Vadim Barkov <vbrkov@gmail.com> | 2018-10-28 03:27:51 +0300 |
|---|---|---|
| committer | Vadim Barkov <vbrkov@gmail.com> | 2018-10-28 03:27:51 +0300 |
| commit | 3feffddd1e8381209a48c24587e36e030051499f (patch) | |
| tree | 48b7c34ea4f12ab644eb9c9e203734796784325a /googlemock/include | |
| parent | 53d61b5b2382891386bfd41f797118de433b358c (diff) | |
| download | googletest-3feffddd1e8381209a48c24587e36e030051499f.tar.gz googletest-3feffddd1e8381209a48c24587e36e030051499f.tar.bz2 googletest-3feffddd1e8381209a48c24587e36e030051499f.zip | |
Replaced all NULLs with nullptr in googlemock
Diffstat (limited to 'googlemock/include')
| -rw-r--r-- | googlemock/include/gmock/gmock-spec-builders.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h index 5d4b73ba..ae5e2913 100644 --- a/googlemock/include/gmock/gmock-spec-builders.h +++ b/googlemock/include/gmock/gmock-spec-builders.h @@ -1914,7 +1914,7 @@ GTEST_DISABLE_MSC_WARNINGS_POP_() // 4251 // 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) \ + ((mock_expr).gmock_##call)(::testing::internal::GetWithoutMatchers(), nullptr) \ .Setter(__FILE__, __LINE__, #mock_expr, #call) #define ON_CALL(obj, call) \ |