Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-28 02:21:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adapt clang rC358696: removal of OutputIsBinary

Browse Source
This commit is contained in:
Fangrui Song 2019-04-18 19:16:24 -07:00
parent 2e6aed4408
commit b2f32788d3
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/messages/textDocument_completion.cc
View File

@ -406,7 +406,12 @@ public:
std::vector<CompletionItem> ls_items; std::vector<CompletionItem> ls_items;
CompletionConsumer(const CodeCompleteOptions &Opts, bool from_cache) CompletionConsumer(const CodeCompleteOptions &Opts, bool from_cache)
: CodeCompleteConsumer(Opts, false), :
#if LLVM_VERSION_MAJOR >= 9 // rC358696
CodeCompleteConsumer(Opts),
#else
CodeCompleteConsumer(Opts, false),
#endif
Alloc(std::make_shared<clang::GlobalCodeCompletionAllocator>()), Alloc(std::make_shared<clang::GlobalCodeCompletionAllocator>()),
CCTUInfo(Alloc), from_cache(from_cache) {} CCTUInfo(Alloc), from_cache(from_cache) {}

9
src/messages/textDocument_signatureHelp.cc
View File

@ -75,9 +75,14 @@ class SignatureHelpConsumer : public CodeCompleteConsumer {
public: public:
bool from_cache; bool from_cache;
SignatureHelp ls_sighelp; SignatureHelp ls_sighelp;
SignatureHelpConsumer(const clang::CodeCompleteOptions &CCOpts, SignatureHelpConsumer(const clang::CodeCompleteOptions &Opts,
bool from_cache) bool from_cache)
: CodeCompleteConsumer(CCOpts, false), :
#if LLVM_VERSION_MAJOR >= 9 // rC358696
CodeCompleteConsumer(Opts),
#else
CodeCompleteConsumer(Opts, false),
#endif
Alloc(std::make_shared<GlobalCodeCompletionAllocator>()), Alloc(std::make_shared<GlobalCodeCompletionAllocator>()),
CCTUInfo(Alloc), from_cache(from_cache) {} CCTUInfo(Alloc), from_cache(from_cache) {}
void ProcessOverloadCandidates(Sema &S, unsigned CurrentArg, void ProcessOverloadCandidates(Sema &S, unsigned CurrentArg,