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

Merge pull request #1941 from barkovv:master

Browse Source 
PiperOrigin-RevId: 219134349
This commit is contained in:
Gennadiy Civil
2018-10-29 13:46:24 -04:00
parent 80b43d900b 3feffddd1e
commit e9085769d4
15 changed files with 157 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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