feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Save/Restore the if-level.

Browse Source
This commit is contained in:
Roberto Raggi
2009-12-09 16:01:20 +01:00
parent 3ab0a28cca
commit 0be80466b8
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/cplusplus/pp-engine.cpp
View File

@@ -757,6 +757,8 @@ bool Preprocessor::markGeneratedTokens(bool markGeneratedTokens,
void Preprocessor::preprocess(const QString &fileName, const QByteArray &source, void Preprocessor::preprocess(const QString &fileName, const QByteArray &source,
QByteArray *result) QByteArray *result)
{ {
const int previousIfLevel = iflevel;
QByteArray *previousResult = _result; QByteArray *previousResult = _result;
_result = result; _result = result;
@@ -889,6 +891,8 @@ void Preprocessor::preprocess(const QString &fileName, const QByteArray &source,
env->currentFile = previousFileName; env->currentFile = previousFileName;
env->currentLine = previousCurrentLine; env->currentLine = previousCurrentLine;
_result = previousResult; _result = previousResult;
iflevel = previousIfLevel;
} }
void Preprocessor::collectActualArguments(QVector<MacroArgumentReference> *actuals) void Preprocessor::collectActualArguments(QVector<MacroArgumentReference> *actuals)