From 19eb9e9e3d4d5a4f0eee786d7664ca0e45137390 Mon Sep 17 00:00:00 2001 From: "zhanyong.wan" Date: Tue, 24 Nov 2009 20:23:18 +0000 Subject: Pulls in gtest r344; improves implicit_cast (by Zhanyong Wan); makes the Python tests work on Windows (by Vlad Losev); adds run_tests.py (by Vlad Losev). --- scripts/gmock_doctor.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/gmock_doctor.py b/scripts/gmock_doctor.py index d21b9ee7..74af1083 100755 --- a/scripts/gmock_doctor.py +++ b/scripts/gmock_doctor.py @@ -340,11 +340,11 @@ def _NeedToUseReturnNullDiagnoser(msg): regex = ('instantiated from \'testing::internal::ReturnAction' '::operator testing::Action\(\) const.*\n' + _FILE_LINE_RE + r'instantiated from here\n' - r'.*gmock-port\.h.*error: invalid conversion from ' - r'\'long int\' to \'(?P.+\*)') + r'.*error: no matching function for call to \'implicit_cast\(' + r'long int&\)') diagnosis = """ You are probably calling Return(NULL) and the compiler isn't sure how to turn -NULL into a %(type)s*. Use ReturnNull() instead. +NULL into the right type. Use ReturnNull() instead. Note: the line number may be off; please fix all instances of Return(NULL).""" return _GenericDiagnoser('NRNULL', 'Need to use ReturnNull', regex, diagnosis, msg) -- cgit v1.2.3