diff options
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 |