From 33ee3ffcca22f08fe8de88504cc2c689ca1b2025 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Mon, 29 Jun 2015 13:16:07 +0200 Subject: Adapt to upstream API change in CompilerOptionsBuilder III excludeDefineLine() can go since the relevant check is now in the base class (again). Change-Id: I572586cc8b52cdd3479b84c677149e3c10a6b804 Reviewed-by: Christian Kandeler --- .../clangstaticanalyzerruncontrol.cpp | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp index 0a1e65676a..2fa5542960 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp +++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp @@ -196,24 +196,6 @@ private: return CompilerOptionsBuilder::defineOption(); } - bool excludeDefineLine(const QByteArray &defineLine) const override - { - if (CompilerOptionsBuilder::excludeDefineLine(defineLine)) - return true; - - // gcc 4.9 has: - // #define __has_include(STR) __has_include__(STR) - // #define __has_include_next(STR) __has_include_next__(STR) - // The right-hand sides are gcc built-ins that clang does not understand, and they'd - // override clang's own (non-macro, it seems) definitions of the symbols on the left-hand - // side. - const bool isGccToolchain = m_projectPart->toolchainType == QLatin1String("gcc"); - if (isGccToolchain && defineLine.contains("has_include")) - return true; - - return false; - } - private: bool m_isMsvcToolchain; }; -- cgit v1.2.1