From 5cfa710aee91744ee865d9fb8e341ee099cf10ba Mon Sep 17 00:00:00 2001 From: vladlosev Date: Mon, 24 Oct 2011 17:48:54 +0000 Subject: Fixed Google Mock Doctor Clang regexes to work on both k8 and piii (by Greg Miller). git-svn-id: http://googlemock.googlecode.com/svn/trunk@401 8415998a-534a-0410-bf83-d39667b30386 --- scripts/gmock_doctor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gmock_doctor.py b/scripts/gmock_doctor.py index 4cfd149..61bbea6 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::operator ' + r'\'testing::internal::ReturnAction<(int|long)>::operator ' r'Action<(?P.*)\(\)>\' requested here') diagnosis = """ You are probably calling Return(NULL) and the compiler isn't sure how to turn -- cgit v1.2.1