Adapt clang rC358696: removal of OutputIsBinary

itzuvid · Apr 19, 2019 · 34c5954 · 34c5954
1 parent 1066548
commit 34c5954
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/messages/textDocument_completion.cc b/src/messages/textDocument_completion.cc
@@ -394,7 +394,12 @@ class CompletionConsumer : public CodeCompleteConsumer {
   std::vector<CompletionItem> ls_items;
 
   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>()),
         CCTUInfo(Alloc), from_cache(from_cache) {}
 

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