diff options
| author | kosak <kosak@google.com> | 2014-03-12 23:27:35 +0000 |
|---|---|---|
| committer | kosak <kosak@google.com> | 2014-03-12 23:27:35 +0000 |
| commit | c26f969579d62444ae7d422b37e0037ceca97a7a (patch) | |
| tree | 191ed20102b39f6405a803e2c670ff6b115950e6 /scripts/generator/cpp/gmock_class.py | |
| parent | b6a348862b3ef745ae4c43117b67c7c6f877cd7e (diff) | |
| download | googletest-c26f969579d62444ae7d422b37e0037ceca97a7a.tar.gz googletest-c26f969579d62444ae7d422b37e0037ceca97a7a.tar.bz2 googletest-c26f969579d62444ae7d422b37e0037ceca97a7a.zip | |
Make the gmock generator work with the 'override' keyword. Also pull in gtest 680.
Diffstat (limited to 'scripts/generator/cpp/gmock_class.py')
| -rwxr-xr-x | scripts/generator/cpp/gmock_class.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/generator/cpp/gmock_class.py b/scripts/generator/cpp/gmock_class.py index 3c8a877d..443accf0 100755 --- 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 |