From b857762432d7e2839f9d463ad91522854327674b Mon Sep 17 00:00:00 2001 From: Ivan Donchevskii Date: Tue, 19 Jun 2018 13:22:19 +0200 Subject: [PATCH] Clang: Remove redundant check Excluding for __cplusplus macro is not required anymore because we currently determine C and C++ files and do not set this macro for C-files. Does not break QTCREATORBUG-12818. Change-Id: I40d5afcb9ef426a6469fb5134ec7d46438201d86 Reviewed-by: David Schulz --- src/plugins/cpptools/compileroptionsbuilder.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index 1188075a2af..786d874786c 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -487,10 +487,6 @@ QString CompilerOptionsBuilder::includeOption() const bool CompilerOptionsBuilder::excludeDefineDirective(const ProjectExplorer::Macro ¯o) const { - // TODO: Remove in QtCreator 4.7 - if (macro.key == "__cplusplus") - return true; - // Ignore for all compiler toolchains since LLVM has it's own implementation for // __has_include(STR) and __has_include_next(STR) if (macro.key.startsWith("__has_include"))