diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2009-11-17 09:40:50 +0100 |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2009-11-17 09:40:50 +0100 |
| commit | 35901130eec54737664e1da89d6a3a2dc9e4cece (patch) | |
| tree | 7a9c123e801a00e46b908d4efa04b7f5aa5ed128 /src/shared/cplusplus/Parser.h | |
| parent | d208a3acc8c2b922bf74fe6536b958cf0650c65e (diff) | |
| parent | fa2eca82622461f2125072a6e667b3c0012d4f44 (diff) | |
| download | qt-creator-35901130eec54737664e1da89d6a3a2dc9e4cece.tar.gz | |
Merge remote branch 'origin/1.3'
Diffstat (limited to 'src/shared/cplusplus/Parser.h')
| -rw-r--r-- | src/shared/cplusplus/Parser.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/shared/cplusplus/Parser.h b/src/shared/cplusplus/Parser.h index ba0785e7ea..3cbf45b0bd 100644 --- a/src/shared/cplusplus/Parser.h +++ b/src/shared/cplusplus/Parser.h @@ -53,6 +53,7 @@ #include "ASTfwd.h" #include "Token.h" #include "TranslationUnit.h" +#include <map> namespace CPlusPlus { @@ -308,7 +309,7 @@ private: bool _inFunctionBody: 1; bool _inObjCImplementationContext: 1; - Array<TemplateArgumentListEntry> _templateArgumentList; + std::map<unsigned, TemplateArgumentListEntry> _templateArgumentList; class Rewind; friend class Rewind; |