Fixed Google Mock Doctor Clang regexes to work on both k8 and piii (by Greg Miller).

This commit is contained in:
vladlosev 2011-10-24 17:48:54 +00:00
parent 0fd8396827
commit f44bdc7398

View File

@ -422,7 +422,7 @@ def _NeedToUseReturnNullDiagnoser(msg):
r'(.*\n)*?' +
_CLANG_NON_GMOCK_FILE_LINE_RE + r'note: in instantiation '
r'of function template specialization '
r'\'testing::internal::ReturnAction<long>::operator '
r'\'testing::internal::ReturnAction<(int|long)>::operator '
r'Action<(?P<type>.*)\(\)>\' requested here')
diagnosis = """
You are probably calling Return(NULL) and the compiler isn't sure how to turn