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

Clang: Define __FUNCSIG__ and others for msvc toolchain

Browse Source 
Affects __FUNCSIG__, __FUNCTION__ and __FUNCDNAME__.
By default Clang can't concatenate strings under those
macros with other strings.
Because of that we need to define them with empty strings
to make clang compile such cases without errors.

Task-number: QTCREATORBUG-19295
Change-Id: I9a3770ebe56b4b8a49ba9982c5a1ba90c8f0b304
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Ivan Donchevskii
2017-11-21 12:18:28 +01:00
parent 59e3d9af1e
commit 194bde265c
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/cpptools/clangcompileroptionsbuilder.cpp
View File

@@ -65,6 +65,7 @@ QStringList ClangCompilerOptionsBuilder::build(CppTools::ProjectFile::Kind fileK
addToolchainAndProjectMacros(); addToolchainAndProjectMacros();
undefineClangVersionMacrosForMsvc(); undefineClangVersionMacrosForMsvc();
undefineCppLanguageFeatureMacrosForMsvc2015(); undefineCppLanguageFeatureMacrosForMsvc2015();
addDefineFunctionMacrosMsvc();
addPredefinedHeaderPathsOptions(); addPredefinedHeaderPathsOptions();
addWrappedQtHeadersIncludePath(); addWrappedQtHeadersIncludePath();

6
src/plugins/cpptools/compileroptionsbuilder.cpp
View File

@@ -339,6 +339,12 @@ void CompilerOptionsBuilder::undefineCppLanguageFeatureMacrosForMsvc2015()
} }
} }
void CompilerOptionsBuilder::addDefineFunctionMacrosMsvc()
{
if (m_projectPart.toolchainType == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID)
addMacros({{"__FUNCSIG__", "\"\""}, {"__FUNCTION__", "\"\""}, {"__FUNCDNAME__", "\"\""}});
}
void CompilerOptionsBuilder::addDefineFloat128ForMingw() void CompilerOptionsBuilder::addDefineFloat128ForMingw()
{ {
// CLANG-UPGRADE-CHECK: Workaround still needed? // CLANG-UPGRADE-CHECK: Workaround still needed?

1
src/plugins/cpptools/compileroptionsbuilder.h
View File

@@ -61,6 +61,7 @@ public:
void addMsvcCompatibilityVersion(); void addMsvcCompatibilityVersion();
void undefineCppLanguageFeatureMacrosForMsvc2015(); void undefineCppLanguageFeatureMacrosForMsvc2015();
void addDefineFunctionMacrosMsvc();
void addDefineFloat128ForMingw(); void addDefineFloat128ForMingw();