diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2010-06-01 11:42:49 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2010-06-01 11:44:34 +0200 |
| commit | efc01fd994a4d7fcc6cc55137bb8c57588d9efa1 (patch) | |
| tree | 2b5cff3aad6800c01fb28d5ab161728da2582e5a /src/shared/cplusplus/AST.cpp | |
| parent | 283019a44aee23d2c99c7012451d35ba56b46f28 (diff) | |
| download | qt-creator-efc01fd994a4d7fcc6cc55137bb8c57588d9efa1.tar.gz | |
Fixed ClassSpecifierAST::lastToken() to return a valid token.
Diffstat (limited to 'src/shared/cplusplus/AST.cpp')
| -rw-r--r-- | src/shared/cplusplus/AST.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/shared/cplusplus/AST.cpp b/src/shared/cplusplus/AST.cpp index 55b978790b..359467b27d 100644 --- a/src/shared/cplusplus/AST.cpp +++ b/src/shared/cplusplus/AST.cpp @@ -562,10 +562,13 @@ unsigned ClassSpecifierAST::lastToken() const else if (dot_dot_dot_token) return dot_dot_dot_token + 1; - else if (base_clause_list) - return base_clause_list->lastToken(); + else if (base_clause_list) { + unsigned token = base_clause_list->lastToken(); + if (token) + return token; + } - else if (colon_token) + if (colon_token) return colon_token + 1; else if (name) |