diff options
| author | vladlosev <vladlosev@8415998a-534a-0410-bf83-d39667b30386> | 2011-10-24 17:48:54 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@8415998a-534a-0410-bf83-d39667b30386> | 2011-10-24 17:48:54 +0000 |
| commit | f44bdc739896bf4085c0aeddb50b5e8f96957901 (patch) | |
| tree | 5ff9ad714307793a66feda551a5d83206cca9d40 | |
| parent | 0fd839682765307c49f9aa67b5c168e3d30bc356 (diff) | |
| download | googletest-f44bdc739896bf4085c0aeddb50b5e8f96957901.tar.gz googletest-f44bdc739896bf4085c0aeddb50b5e8f96957901.tar.bz2 googletest-f44bdc739896bf4085c0aeddb50b5e8f96957901.zip | |
Fixed Google Mock Doctor Clang regexes to work on both k8 and piii (by Greg Miller).
| -rwxr-xr-x | scripts/gmock_doctor.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/gmock_doctor.py b/scripts/gmock_doctor.py index 4cfd1493..61bbea62 100755 --- a/scripts/gmock_doctor.py +++ b/scripts/gmock_doctor.py @@ -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 |