diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-21 10:32:21 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-21 10:32:21 -0400 |
commit | b88511ef640c046ec9c7553b383a2aba64c80967 (patch) | |
tree | da0d99ab08f13a66da37b66c5f07bbd603ad72bc /googlemock/scripts/generator/cpp/ast.py | |
parent | 735bd75f69f8a1c6240c95915edfa091bfa976ac (diff) | |
parent | a6e7ba27c73726169811f3ae157951d946179499 (diff) | |
download | googletest-b88511ef640c046ec9c7553b383a2aba64c80967.tar.gz googletest-b88511ef640c046ec9c7553b383a2aba64c80967.tar.bz2 googletest-b88511ef640c046ec9c7553b383a2aba64c80967.zip |
Merge pull request #1194 from joshbodily/josh/fix_scoped_class2
Fix scoped enum not working in gmock-gen.py
Diffstat (limited to 'googlemock/scripts/generator/cpp/ast.py')
-rwxr-xr-x | googlemock/scripts/generator/cpp/ast.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/googlemock/scripts/generator/cpp/ast.py b/googlemock/scripts/generator/cpp/ast.py index cce32724..f14728b4 100755 --- a/googlemock/scripts/generator/cpp/ast.py +++ b/googlemock/scripts/generator/cpp/ast.py @@ -1264,6 +1264,9 @@ class AstBuilder(object): return self._GetNestedType(Union) def handle_enum(self): + token = self._GetNextToken() + if not (token.token_type == tokenize.NAME and token.name == 'class'): + self._AddBackToken(token) return self._GetNestedType(Enum) def handle_auto(self): |