1 files changed, 8 insertions, 5 deletions
diff --git a/src/shared/cplusplus/AST.h b/src/shared/cplusplus/AST.h
index c8cb6694af..46718574d6 100644
--- a/src/shared/cplusplus/AST.h
+++ b/src/shared/cplusplus/AST.h
@@ -81,15 +81,18 @@ public:
 
     unsigned lastToken() const
     {
-        unsigned token = 0;
+        _Tp lastValue = 0;
 
         for (const List *it = this; it; it = it->next) {
             if (it->value)
-                token = it->value->lastToken();
+                lastValue = it->value;
         }
 
-        // assert(token != 0);
-        return token;
+        if (lastValue)
+            return lastValue->lastToken();
+
+        // ### assert(0);
+        return 0;
     }
 
     _Tp value;
@@ -616,7 +619,7 @@ protected:
 class CPLUSPLUS_EXPORT ConditionAST: public ExpressionAST
 {
 public:
-    SpecifierListAST *type_specifier;
+    SpecifierListAST *type_specifiers;
     DeclaratorAST *declarator;
 
 public: