diff options
| author | hjk <qtc-committer@nokia.com> | 2012-04-18 17:44:23 +0200 |
|---|---|---|
| committer | hjk <qthjk@ovi.com> | 2012-04-19 18:41:18 +0200 |
| commit | acf6f8f0cb8e70e90ecf3500369e2f36c505b387 (patch) | |
| tree | ea1418e1029528f8b42a9168e2a5fa3d169f93d2 /src/libs/cplusplus/pp-engine.cpp | |
| parent | 3428240233fcfeb90f8fa11cca0bb9767d0d1ff8 (diff) | |
| download | qt-creator-acf6f8f0cb8e70e90ecf3500369e2f36c505b387.tar.gz | |
preprocessor: make Environment::{resolve,remove} work on ByteArrayRefs only
Change-Id: Idb93d359bd45696a38cb863dcea30c5c377eeabb
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/libs/cplusplus/pp-engine.cpp')
| -rw-r--r-- | src/libs/cplusplus/pp-engine.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index ebf1790a10..262fd8777f 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -795,8 +795,7 @@ bool Preprocessor::handleIdentifier(PPToken *tk) } } - const QByteArray macroName = macroNameRef.toByteArray(); - Macro *macro = m_env->resolve(macroName); + Macro *macro = m_env->resolve(macroNameRef); if (!macro) return false; if (tk->generated() && m_state.m_tokenBuffer && m_state.m_tokenBuffer->isBlocked(macro)) @@ -804,7 +803,7 @@ bool Preprocessor::handleIdentifier(PPToken *tk) // qDebug() << "expanding" << macro->name() << "on line" << tk->lineno; if (m_client && !tk->generated()) - m_client->startExpandingMacro(tk->offset, *macro, macroName); + m_client->startExpandingMacro(tk->offset, *macro, macroNameRef); QVector<PPToken> body = macro->definitionTokens(); if (macro->isFunctionLike()) { @@ -1470,7 +1469,7 @@ void Preprocessor::handleUndefDirective(PPToken *tk) lex(tk); // consume "undef" token if (tk->is(T_IDENTIFIER)) { const ByteArrayRef macroName = tk->asByteArrayRef(); - const Macro *macro = m_env->remove(macroName.toByteArray()); + const Macro *macro = m_env->remove(macroName); if (m_client && macro) m_client->macroAdded(*macro); |