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

Merge remote-tracking branch 'origin/3.1'

Browse Source 
Conflicts:
	README
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: Ib9aef37a246bc3bb9bca0c32a902af3b09ef3146
This commit is contained in:
Oswald Buddenhagen
2014-03-11 13:39:55 +01:00
parent ee299651df 01715c6172
commit 52bf71fbdf
279 changed files with 3131 additions and 1418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -976,7 +976,7 @@ bool Preprocessor::handleIdentifier(PPToken *tk)
QVector<PPToken> body = macro->definitionTokens();
// Withing nested expansion we might reach a previously added marker token. In this case,
// Within nested expansion we might reach a previously added marker token. In this case,
// we need to move it from its current possition to outside the nesting.
PPToken oldMarkerTk;
@@ -1837,13 +1837,13 @@ void Preprocessor::handleElifDirective(PPToken *tk, const PPToken &poundToken)
m_state.m_skipping[m_state.m_ifLevel] = true;
} else if (m_state.m_trueTest[m_state.m_ifLevel]) {
if (!m_state.m_skipping[m_state.m_ifLevel]) {
// start skipping because the preceeding then-part was not skipped
// start skipping because the preceding then-part was not skipped
m_state.m_skipping[m_state.m_ifLevel] = true;
if (m_client)
startSkippingBlocks(poundToken);
}
} else {
// preceeding then-part was skipped, so calculate if we should start
// preceding then-part was skipped, so calculate if we should start
// skipping, depending on the condition
Value result;
evalExpression(tk, result);