diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-06-23 16:34:51 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-06-23 16:35:06 +0200 |
| commit | 8744dab3980d8437a271de8811678fa60feb7576 (patch) | |
| tree | 70c4e00897a34a4fe4f7b95ad1e1a0a4d1d95d6f /src/shared/cplusplus/AST.cpp | |
| parent | 658a22766d6b8d6f25ab93610994e907e0730654 (diff) | |
| download | qt-creator-8744dab3980d8437a271de8811678fa60feb7576.tar.gz | |
Fixed fistToken/lastToken for BaseSpecifierAST.
Diffstat (limited to 'src/shared/cplusplus/AST.cpp')
| -rw-r--r-- | src/shared/cplusplus/AST.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/shared/cplusplus/AST.cpp b/src/shared/cplusplus/AST.cpp index 34d2491ffe..1cedc2164d 100644 --- a/src/shared/cplusplus/AST.cpp +++ b/src/shared/cplusplus/AST.cpp @@ -360,6 +360,10 @@ unsigned BaseSpecifierAST::firstToken() const { if (virtual_token && access_specifier_token) return std::min(virtual_token, access_specifier_token); + if (virtual_token) + return virtual_token; + if (access_specifier_token) + return access_specifier_token; return name->firstToken(); } @@ -368,7 +372,7 @@ unsigned BaseSpecifierAST::lastToken() const if (name) return name->lastToken(); else if (virtual_token && access_specifier_token) - return std::min(virtual_token, access_specifier_token) + 1; + return std::max(virtual_token, access_specifier_token) + 1; else if (virtual_token) return virtual_token + 1; else if (access_specifier_token) |