feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Compile against llvm/clang 4.0

Browse Source 
Task-number: QTCREATORBUG-17692
Change-Id: I2781129543c09aa64938c9570896d592b57a753c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Nikolai Kosjar
2017-03-08 13:23:36 +01:00
parent f6e75c43d1
commit 5455a45784
4 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/clangrefactoringbackend/source/refactoringcompilationdatabase.cpp
View File

@@ -82,7 +82,11 @@ void RefactoringCompilationDatabase::addFile(const std::string &directory,
const std::string &fileName,
const std::vector<std::string> &commandLine)
{
#if LLVM_VERSION_MAJOR >= 4
compileCommands.emplace_back(directory, fileName, commandLine, nullptr);
#else
compileCommands.emplace_back(directory, fileName, commandLine);
#endif
}
} // namespace ClangBackEnd

2
src/tools/clangrefactoringbackend/source/sourcelocationsutils.h
View File

@@ -53,7 +53,7 @@
namespace ClangBackEnd {
inline
llvm::SmallString<256> absolutePath(const char *path)
llvm::SmallString<256> absolutePath(const llvm::StringRef &path)
{
llvm::SmallString<256> absolutePath(path);