From 962ca920d8c752e106f23ad266651e1fc87627e9 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 3 Oct 2019 21:56:13 +0300 Subject: [PATCH] Clang: Support skip warnings with LLVM9 + move the macro to its single user. Change-Id: I141357386e62f44f096ce4c50124cea8f618fb21 Reviewed-by: Nikolai Kosjar --- src/tools/clangbackend/source/clangbackend_global.h | 5 ----- .../clangbackend/source/clangtranslationunitupdater.cpp | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/tools/clangbackend/source/clangbackend_global.h b/src/tools/clangbackend/source/clangbackend_global.h index 0e89673b968..e62c9a35130 100644 --- a/src/tools/clangbackend/source/clangbackend_global.h +++ b/src/tools/clangbackend/source/clangbackend_global.h @@ -36,9 +36,4 @@ enum class PreferredTranslationUnit LastUninitialized, }; -// CLANG-UPGRADE-CHECK: Remove IS_SKIPWARNINGSFROMINCLUDEDFILES_SUPPORTED -#if defined(CINDEX_VERSION_HAS_SKIPWARNINGSFROMINCLUDEDFILES_BACKPORTED) -# define IS_SKIPWARNINGSFROMINCLUDEDFILES_SUPPORTED -#endif - } // namespace ClangBackEnd diff --git a/src/tools/clangbackend/source/clangtranslationunitupdater.cpp b/src/tools/clangbackend/source/clangtranslationunitupdater.cpp index b70f828d8f7..0383a1028f1 100644 --- a/src/tools/clangbackend/source/clangtranslationunitupdater.cpp +++ b/src/tools/clangbackend/source/clangtranslationunitupdater.cpp @@ -179,7 +179,8 @@ uint TranslationUnitUpdater::defaultParseOptions() | CXTranslationUnit_CreatePreambleOnFirstParse | CXTranslationUnit_SkipFunctionBodies | CXTranslationUnit_LimitSkipFunctionBodiesToPreamble -#ifdef IS_SKIPWARNINGSFROMINCLUDEDFILES_SUPPORTED +// CLANG-UPGRADE-CHECK: Remove when required version is 9 +#if (LLVM_VERSION_MAJOR >= 9) || defined(CINDEX_VERSION_HAS_SKIPWARNINGSFROMINCLUDEDFILES_BACKPORTED) | CXTranslationUnit_IgnoreNonErrorsFromIncludedFiles #endif | CXTranslationUnit_IncludeBriefCommentsInCodeCompletion