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

preprocessor: make Environment::{resolve,remove} work on ByteArrayRefs only

Browse Source 
Change-Id: Idb93d359bd45696a38cb863dcea30c5c377eeabb
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-04-18 17:44:23 +02:00
committed by hjk
parent 3428240233
commit acf6f8f0cb
8 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -518,7 +518,7 @@ void CppPreprocessor::failedMacroDefinitionCheck(unsigned offset, const ByteArra
void CppPreprocessor::startExpandingMacro(unsigned offset,
const Macro &macro,
const QByteArray &originalText,
const ByteArrayRef &originalText,
const QVector<MacroArgumentReference> &actuals)
{
if (! m_currentDoc)

2
src/plugins/cpptools/cppmodelmanager.h
View File

@@ -303,7 +303,7 @@ protected:
virtual void failedMacroDefinitionCheck(unsigned offset, const CPlusPlus::ByteArrayRef &name);
virtual void startExpandingMacro(unsigned offset,
const CPlusPlus::Macro &macro,
const QByteArray &originalText,
const CPlusPlus::ByteArrayRef &originalText,
const QVector<CPlusPlus::MacroArgumentReference> &actuals);
virtual void stopExpandingMacro(unsigned offset, const CPlusPlus::Macro &macro);
virtual void startSkippingBlocks(unsigned offset);