Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-04-04 16:02:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix std::optional -> llvm::Optional for up-to-date upstream llvm 16.0.0.

Browse Source
This commit is contained in:
mxlol233 2023-01-01 14:21:33 +08:00
parent 3affc60eb4
commit 9be6d02413
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/indexer.cc
View File

@ -1098,7 +1098,7 @@ public:
StringRef included, bool isAngled, StringRef included, bool isAngled,
CharSourceRange filenameRange, CharSourceRange filenameRange,
#if LLVM_VERSION_MAJOR >= 16 // llvmorg-16-init-14884-g8f0df9f3bbc6 #if LLVM_VERSION_MAJOR >= 16 // llvmorg-16-init-14884-g8f0df9f3bbc6
std::optional<FileEntryRef> fileRef, llvm::Optional<FileEntryRef> fileRef,
#elif LLVM_VERSION_MAJOR >= 15 // llvmorg-15-init-7692-gd79ad2f1dbc2 #elif LLVM_VERSION_MAJOR >= 15 // llvmorg-15-init-7692-gd79ad2f1dbc2
llvm::Optional<FileEntryRef> fileRef, llvm::Optional<FileEntryRef> fileRef,
#else #else

2
src/project.cc
View File

@ -392,7 +392,7 @@ void Project::loadDirectory(const std::string &root, Project::Folder &folder) {
fclose(fout); fclose(fout);
} }
#if LLVM_VERSION_MAJOR >= 16 // llvmorg-16-init-12589-ge748db0f7f09 #if LLVM_VERSION_MAJOR >= 16 // llvmorg-16-init-12589-ge748db0f7f09
std::array<std::optional<StringRef>, 3> std::array<Optional<StringRef>, 3>
#else #else
std::array<Optional<StringRef>, 3> std::array<Optional<StringRef>, 3>
#endif #endif

2
src/sema_manager.cc
View File

@ -180,7 +180,7 @@ public:
StringRef fileName, bool isAngled, StringRef fileName, bool isAngled,
CharSourceRange filenameRange, CharSourceRange filenameRange,
#if LLVM_VERSION_MAJOR >= 16 // llvmorg-16-init-14884-g8f0df9f3bbc6 #if LLVM_VERSION_MAJOR >= 16 // llvmorg-16-init-14884-g8f0df9f3bbc6
std::optional<FileEntryRef> fileRef, llvm::Optional<FileEntryRef> fileRef,
#elif LLVM_VERSION_MAJOR >= 15 // llvmorg-15-init-7692-gd79ad2f1dbc2 #elif LLVM_VERSION_MAJOR >= 15 // llvmorg-15-init-7692-gd79ad2f1dbc2
llvm::Optional<FileEntryRef> fileRef, llvm::Optional<FileEntryRef> fileRef,
#else #else