AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moc: Fix assertion in QVector::first()

Browse Source 
introduced in aea68c93ae

Change-Id: I05c1dfa16c42019ee0a0b44ffc50ad2c2c0d209b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Konstantin Ritt 2012-11-25 05:54:45 +02:00 committed by The Qt Project
parent 3aa55d5a25
commit 6d1acac613
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/tools/moc/preprocessor.cpp
View File

@ -1099,12 +1099,16 @@ void Preprocessor::preprocess(const QByteArray &filename, Symbols &preprocessed)
(macro.symbols.last().token == PP_WHITESPACE || macro.symbols.last().token == WHITESPACE))
macro.symbols.pop_back();
if (macro.symbols.first().token == PP_HASHHASH ||
macro.symbols.last().token == PP_HASHHASH)
error("'##' cannot appear at either end of a macro expansion");
if (macro.symbols.last().token == HASH ||
macro.symbols.last().token == PP_HASH)
error("'#' is not followed by a macro parameter");
if (!macro.symbols.isEmpty()) {
if (macro.symbols.first().token == PP_HASHHASH ||
macro.symbols.last().token == PP_HASHHASH) {
error("'##' cannot appear at either end of a macro expansion");
}
if (macro.symbols.last().token == HASH ||
macro.symbols.last().token == PP_HASH) {
error("'#' is not followed by a macro parameter");
}
}
macros.insert(name, macro);
continue;
}