Change IsNull and NotNull to use ==/!= nullptr in C++11.

Also update gmock_doctor due to Clang wording change.
This commit is contained in:
kosak
2015-04-28 22:36:31 +00:00
parent 5625dd333a
commit 6305ff5a92
3 changed files with 27 additions and 1 deletions

View File

@@ -362,7 +362,7 @@ def _MockObjectPointerDiagnoser(msg):
r'which is of non-class type \'(.*::)*(?P<class_name>.+)\*\'')
clang_regex = (_CLANG_FILE_LINE_RE + r'error: member reference type '
r'\'(?P<class_name>.*?) *\' is a pointer; '
r'maybe you meant to use \'->\'\?')
r'(did you mean|maybe you meant) to use \'->\'\?')
diagnosis = """
The first argument to ON_CALL() and EXPECT_CALL() must be a mock *object*,
not a *pointer* to it. Please write '*(%(mock_object)s)' instead of