diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-10-03 21:56:13 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2019-10-07 09:12:27 +0000 |
| commit | 962ca920d8c752e106f23ad266651e1fc87627e9 (patch) | |
| tree | e4091ed34ecae9875032896bd8964be64d85ae1f /src/tools | |
| parent | 83671ebdaed8cc5a8b14b4429f6f93152961a8db (diff) | |
| download | qt-creator-962ca920d8c752e106f23ad266651e1fc87627e9.tar.gz | |
Clang: Support skip warnings with LLVM9
+ move the macro to its single user.
Change-Id: I141357386e62f44f096ce4c50124cea8f618fb21
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/clangbackend/source/clangbackend_global.h | 5 | ||||
| -rw-r--r-- | src/tools/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 0e89673b96..e62c9a3513 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 b70f828d8f..0383a1028f 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 |