diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-07-27 21:47:03 +0200 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-03 14:59:42 +0200 |
commit | d0457b70e33f1a090a91b0037e9254a0e14b8427 (patch) | |
tree | 2984b2db2129ba8cfefeac46d246a4a335b92150 /src/libs/cplusplus/SimpleLexer.cpp | |
parent | 88549a4b1dbbb16c7d63f176fd870ec8bdb61477 (diff) | |
download | qt-creator-d0457b70e33f1a090a91b0037e9254a0e14b8427.tar.gz |
Compile the C++ parser library with Sun CC 5.9.
Things you mustn't do:
1) end an enum with a comma
2) #include <cxxxx> and not use std::
3) use anonymous structures
All three things are invalid C++. Anonymous structures inside
anonymous unions are allowed by GCC, but that doesn't mean it's valid.
Diffstat (limited to 'src/libs/cplusplus/SimpleLexer.cpp')
-rw-r--r-- | src/libs/cplusplus/SimpleLexer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/cplusplus/SimpleLexer.cpp b/src/libs/cplusplus/SimpleLexer.cpp index 60ce47cd8f..7fa9677bda 100644 --- a/src/libs/cplusplus/SimpleLexer.cpp +++ b/src/libs/cplusplus/SimpleLexer.cpp @@ -129,14 +129,14 @@ QList<SimpleToken> SimpleLexer::operator()(const QString &text, int state) break; SimpleToken simpleTk; - simpleTk._kind = int(tk.kind); + simpleTk._kind = int(tk.f.kind); simpleTk._position = int(lex.tokenOffset()); simpleTk._length = int(lex.tokenLength()); simpleTk._text = text.midRef(simpleTk._position, simpleTk._length); lex.setScanAngleStringLiteralTokens(false); - if (tk.newline && tk.is(T_POUND)) + if (tk.f.newline && tk.is(T_POUND)) inPreproc = true; else if (inPreproc && tokens.size() == 1 && simpleTk.is(T_IDENTIFIER) && simpleTk.text() == QLatin1String("include")) |