gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced all NULLs with nullptr in googlemock

Browse Source
This commit is contained in:
Vadim Barkov
2018-10-28 03:27:51 +03:00
parent 53d61b5b23
commit 3feffddd1e
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
googlemock/include/gmock/gmock-spec-builders.h
View File

@@ -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) \