From ce9f503691dd943fb0f376a91b77b1cf4e1bbc9e Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Wed, 21 Nov 2018 20:11:07 +0100 Subject: ClangPchManager: Add UsedMacroFilter The compiler macros are filtered in system and project macros. Not used ones are removed. The original order of the macros is retained. Task-number: QTCREATORBUG-21548 Change-Id: Ic9265866bde033e6a9600f9e6439b1697ab73422 Reviewed-by: Ivan Donchevskii --- src/plugins/clangpchmanager/projectupdater.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/plugins/clangpchmanager') diff --git a/src/plugins/clangpchmanager/projectupdater.cpp b/src/plugins/clangpchmanager/projectupdater.cpp index a3fbb6cb62..7929059850 100644 --- a/src/plugins/clangpchmanager/projectupdater.cpp +++ b/src/plugins/clangpchmanager/projectupdater.cpp @@ -156,10 +156,11 @@ QStringList ProjectUpdater::compilerArguments(CppTools::ProjectPart *projectPart ClangBackEnd::CompilerMacros ProjectUpdater::createCompilerMacros(const ProjectExplorer::Macros &projectMacros) { - auto macros = Utils::transform(projectMacros, - [] (const ProjectExplorer::Macro ¯o) { - return ClangBackEnd::CompilerMacro{macro.key, macro.value}; - }); + int index = 0; + auto macros = Utils::transform( + projectMacros, [&](const ProjectExplorer::Macro ¯o) { + return ClangBackEnd::CompilerMacro{macro.key, macro.value, ++index}; + }); std::sort(macros.begin(), macros.end()); -- cgit v1.2.3