diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-06-13 10:51:51 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-06-13 10:51:51 +0200 |
| commit | 2786250c172138c1ece456305264f7b5039b8f2a (patch) | |
| tree | dd0a56d98aefe9e1c6a3042b5cbcc37e87bd903b /src/libs/3rdparty/cplusplus/Parser.cpp | |
| parent | e9d433a99a8fa4769df92f9caaaaaec049596c34 (diff) | |
| parent | 27cc89eb4a1e157c68793718602416448547de20 (diff) | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/shared/qbs
Change-Id: Iba59e41db72e2afdf594f1f7003215d7d8d1e6d3
Diffstat (limited to 'src/libs/3rdparty/cplusplus/Parser.cpp')
| -rw-r--r-- | src/libs/3rdparty/cplusplus/Parser.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libs/3rdparty/cplusplus/Parser.cpp b/src/libs/3rdparty/cplusplus/Parser.cpp index 35d8d917a0..876b138b6a 100644 --- a/src/libs/3rdparty/cplusplus/Parser.cpp +++ b/src/libs/3rdparty/cplusplus/Parser.cpp @@ -2003,12 +2003,6 @@ bool Parser::parseClassSpecifier(SpecifierListAST *&node) NameAST *name = 0; parseName(name); - if (! name && LA() == T_LBRACE && (LA(0) == T_CLASS || LA(0) == T_STRUCT || LA(0) == T_UNION || LA(0) == T_ENUM)) { - AnonymousNameAST *ast = new (_pool) AnonymousNameAST; - ast->class_token = classkey_token; - name = ast; - } - bool parsed = false; const bool previousInFunctionBody = _inFunctionBody; @@ -2025,6 +2019,12 @@ bool Parser::parseClassSpecifier(SpecifierListAST *&node) } if (LA() == T_COLON || LA() == T_LBRACE) { + if (!name) { + AnonymousNameAST *ast = new (_pool) AnonymousNameAST; + ast->class_token = classkey_token; + name = ast; + } + BaseSpecifierListAST *base_clause_list = 0; if (LA() == T_COLON) { |