From 1ecadd7d76432f12ee983386af30f64b352f3380 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Wed, 5 Aug 2015 17:28:47 +0200 Subject: Clang: Filter out "#include_next in primary source file" warning for headers Another diagnostic that can't be turned off. Change-Id: I1e4452ccbb2f1864e1a68cf02a858d410cd0c162 Reviewed-by: Marco Bubke --- src/plugins/clangcodemodel/semanticmarker.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/plugins/clangcodemodel/semanticmarker.cpp') diff --git a/src/plugins/clangcodemodel/semanticmarker.cpp b/src/plugins/clangcodemodel/semanticmarker.cpp index cb17346d10..274e28e5ca 100644 --- a/src/plugins/clangcodemodel/semanticmarker.cpp +++ b/src/plugins/clangcodemodel/semanticmarker.cpp @@ -134,10 +134,12 @@ static void appendDiagnostic(const CXDiagnostic &diag, static bool isBlackListedDiagnostic(const Utils::MimeType &mimeType, const QString &diagnostic) { - static QString pragmaOnceInMainFile = QLatin1String("#pragma once in main file"); + static const QStringList blackList { + QLatin1String("#pragma once in main file"), + QLatin1String("#include_next in primary source file") + }; - return diagnostic == pragmaOnceInMainFile - && mimeType.inherits(QLatin1String("text/x-chdr")); + return mimeType.inherits(QLatin1String("text/x-chdr")) && blackList.contains(diagnostic); } QList SemanticMarker::diagnostics() const -- cgit v1.2.1