Make the gmock generator work with the 'override' keyword. Also pull in gtest 680.

2014-03-12 23:27:35 +00:00
parent b6a348862b
commit c26f969579
3 changed files with 17 additions and 2 deletions
--- a/scripts/generator/cpp/gmock_class.py
+++ b/scripts/generator/cpp/gmock_class.py
@@ -49,7 +49,8 @@ _INDENT = 2


 def _GenerateMethods(output_lines, source, class_node):
-  function_type = ast.FUNCTION_VIRTUAL | ast.FUNCTION_PURE_VIRTUAL
+  function_type = (ast.FUNCTION_VIRTUAL | ast.FUNCTION_PURE_VIRTUAL |
+                   ast.FUNCTION_OVERRIDE)
  ctor_or_dtor = ast.FUNCTION_CTOR | ast.FUNCTION_DTOR
  indent = ' ' * _INDENT