Update gmock and gtest.

testing/gmock/scripts/gmock_doctor.py

 #!/usr/bin/env python
 #
 # Copyright 2008, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
@@ skipping 168 matching lines @@
 *something*.  Please tell it *what* to return.  Perhaps you can use
 the pattern DoAll(some_action, Return(some_value))?"""
   return _GenericDiagnoser('NRS', 'Need to Return Something',
                            regex, diagnosis, msg)
 
 
 def _NeedToReturnNothingDiagnoser(msg):
   """Diagnoses the NRN disease, given the error messages by gcc."""
 
   regex = (_FILE_LINE_RE + r'instantiated from here\n'
-           r'.*gmock-actions\.h.*error: return-statement with a value, '
-           r'in function returning \'void\'')
+           r'.*gmock-actions\.h.*error: instantiation of '
+           r'\'testing::internal::ReturnAction<R>::Impl<F>::value_\' '
+           r'as type \'void\'')
   diagnosis = """
 You are using an action that returns *something*, but it needs to return
 void.  Please use a void-returning action instead.
 
 All actions but the last in DoAll(...) must return void.  Perhaps you need
 to re-arrange the order of actions in a DoAll(), if you are using one?"""
   return _GenericDiagnoser('NRN', 'Need to Return Nothing',
                            regex, diagnosis, msg)
 
 
@@ skipping 128 matching lines @@
 ?"""
   for m in _FindAllMatches(regex, msg):
     symbol = m.groupdict()['symbol']
     if symbol in _COMMON_GMOCK_SYMBOLS:
       yield ('NUS', 'Need to Use Symbol', diagnosis % m.groupdict())
 
 
 def _NeedToUseReturnNullDiagnoser(msg):
   """Diagnoses the NRNULL disease, given the error messages by gcc."""
 
-  regex = (_FILE_LINE_RE + r'instantiated from here\n'
-           r'.*gmock-actions\.h.*error: invalid conversion from '
-           r'\'long int\' to \'(?P<type>.+\*)')
+  regex = ('instantiated from \'testing::internal::ReturnAction<R>'
+           '::operator testing::Action<Func>\(\) const.*\n' +
+           _FILE_LINE_RE + r'instantiated from here\n'
+           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)
 
 
 _TTB_DIAGNOSIS = """
 In a mock class template, types or typedefs defined in the base class
 template are *not* automatically visible.  This is how C++ works.  Before
 you can use a type or typedef named %(type)s defined in base class Base<T>, you
 need to make it visible.  One way to do it is:
 
   typedef typename Base<T>::%(type)s %(type)s;"""
 
 
 def _TypeInTemplatedBaseDiagnoser1(msg):
   """Diagnoses the TTB disease, given the error messages by gcc.
 
   This version works when the type is used as the mock function's return
   type.
   """
 
-  regex = (r'In member function \'int .*\n' + _FILE_LINE_RE +
-           r'error: a function call cannot appear in a constant-expression')
+  gcc_4_3_1_regex = (
+      r'In member function \'int .*\n' + _FILE_LINE_RE +
+      r'error: a function call cannot appear in a constant-expression')
+  gcc_4_4_0_regex = (
+      r'error: a function call cannot appear in a constant-expression'
+      + _FILE_LINE_RE + r'error: template argument 1 is invalid\n')
   diagnosis = _TTB_DIAGNOSIS % {'type': 'Foo'}
-  return _GenericDiagnoser('TTB', 'Type in Template Base',
-                           regex, diagnosis, msg)
+  return (list(_GenericDiagnoser('TTB', 'Type in Template Base',
+                                gcc_4_3_1_regex, diagnosis, msg)) +
+          list(_GenericDiagnoser('TTB', 'Type in Template Base',
+                                 gcc_4_4_0_regex, diagnosis, msg)))
 
 
 def _TypeInTemplatedBaseDiagnoser2(msg):
   """Diagnoses the TTB disease, given the error messages by gcc.
 
   This version works when the type is used as the mock function's sole
   parameter type.
   """
 
-  regex = (r'In member function \'int .*\n'
-           + _FILE_LINE_RE +
+  regex = (_FILE_LINE_RE +
            r'error: \'(?P<type>.+)\' was not declared in this scope\n'
            r'.*error: template argument 1 is invalid\n')
   return _GenericDiagnoser('TTB', 'Type in Template Base',
                            regex, _TTB_DIAGNOSIS, msg)
 
 
 def _TypeInTemplatedBaseDiagnoser3(msg):
   """Diagnoses the TTB disease, given the error messages by gcc.
 
   This version works when the type is used as a parameter of a mock
@@ skipping 56 matching lines @@
     _TypeInTemplatedBaseDiagnoser2,
     _TypeInTemplatedBaseDiagnoser3,
     _WrongMockMethodMacroDiagnoser,
     _WrongParenPositionDiagnoser,
     ]
 
 
 def Diagnose(msg):
   """Generates all possible diagnoses given the gcc error message."""
 
+  diagnoses = []
   for diagnoser in _DIAGNOSERS:
-    for diagnosis in diagnoser(msg):
-      yield '[%s - %s]\n%s' % diagnosis
+    for diag in diagnoser(msg):
+      diagnosis = '[%s - %s]\n%s' % diag
+      if not diagnosis in diagnoses:
+        diagnoses.append(diagnosis)
+  return diagnoses
 
 
 def main():
   print ('Google Mock Doctor v%s - '
          'diagnoses problems in code using Google Mock.' % _VERSION)
 
   if sys.stdin.isatty():
     print ('Please copy and paste the compiler errors here.  Press c-D when '
            'you are done:')
   else:
     print 'Waiting for compiler errors on stdin . . .'
 
   msg = sys.stdin.read().strip()
-  diagnoses = list(Diagnose(msg))
+  diagnoses = Diagnose(msg)
   count = len(diagnoses)
   if not count:
     print '\nGcc complained:'
     print '8<------------------------------------------------------------'
     print msg
     print '------------------------------------------------------------>8'
     print """
 Uh-oh, I'm not smart enough to figure out what the problem is. :-(
 However...
 If you send your source code and gcc's error messages to
@@ skipping 13 matching lines @@
         print '\n#%s:' % (i,)
       print d
     print """
 How did I do?  If you think I'm wrong or unhelpful, please send your
 source code and gcc's error messages to googlemock@googlegroups.com.  Then
 you can be helped and I can get smarter -- I promise I won't be upset!"""
 
 
 if __name__ == '__main__':
   main()