diff options
| author | jgm@google.com <jgm@google.com@8415998a-534a-0410-bf83-d39667b30386> | 2012-04-10 16:02:11 +0000 |
|---|---|---|
| committer | jgm@google.com <jgm@google.com@8415998a-534a-0410-bf83-d39667b30386> | 2012-04-10 16:02:11 +0000 |
| commit | 9bc5e4afdb0407b5fd4acb101e3b11850a90a873 (patch) | |
| tree | 148e73f4c3b6354f900cae94be5e9495e04d7efa /scripts/gmock_doctor.py | |
| parent | 6260125d98ddc9bea2cfef739b0f7378f0264a3e (diff) | |
| download | googlemock-9bc5e4afdb0407b5fd4acb101e3b11850a90a873.tar.gz | |
Reduced template instantiation depth for the AllOf and AnyOf matchers. Also some formatting changes.
git-svn-id: http://googlemock.googlecode.com/svn/trunk@405 8415998a-534a-0410-bf83-d39667b30386
Diffstat (limited to 'scripts/gmock_doctor.py')
| -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 61bbea6..d5c4518 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)*?' + |