aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorjgm <jgm@google.com>2012-04-10 16:02:11 +0000
committerjgm <jgm@google.com>2012-04-10 16:02:11 +0000
commit79a367eb217fcd47e2beaf8c0f87fe6d5926f739 (patch)
tree148e73f4c3b6354f900cae94be5e9495e04d7efa /scripts
parent9bcb5f9146db42bc38b6bb744fb0cf518a0205be (diff)
downloadgoogletest-79a367eb217fcd47e2beaf8c0f87fe6d5926f739.tar.gz
googletest-79a367eb217fcd47e2beaf8c0f87fe6d5926f739.tar.bz2
googletest-79a367eb217fcd47e2beaf8c0f87fe6d5926f739.zip
Reduced template instantiation depth for the AllOf and AnyOf matchers. Also some formatting changes.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/gmock_doctor.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/gmock_doctor.py b/scripts/gmock_doctor.py
index 61bbea62..d5c45180 100755
--- a/scripts/gmock_doctor.py
+++ b/scripts/gmock_doctor.py
@@ -416,7 +416,7 @@ def _NeedToUseReturnNullDiagnoser(msg):
'::operator testing::Action<Func>\(\) const.*\n' +
_GCC_FILE_LINE_RE + r'instantiated from here\n'
r'.*error: no matching function for call to \'ImplicitCast_\('
- r'long int&\)')
+ r'(:?long )?int&\)')
clang_regex = (r'\bgmock-actions.h:.* error: no matching function for '
r'call to \'ImplicitCast_\'\r?\n'
r'(.*\n)*?' +