Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Apr 2020 09:08:06 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r532927 - head/devel/ccls/files
Message-ID:  <202004250908.03P986l7024548@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Sat Apr 25 09:08:06 2020
New Revision: 532927
URL: https://svnweb.freebsd.org/changeset/ports/532927

Log:
  devel/ccls: Unbreak build with LLVM10
  
  src/indexer.cc:683:50: error: only virtual member functions can be marked 'override'
                             ASTNodeInfo ast_node) override {
                                                   ^~~~~~~~~
  1 error generated.

Added:
  head/devel/ccls/files/
  head/devel/ccls/files/patch-src_indexer.cc   (contents, props changed)

Added: head/devel/ccls/files/patch-src_indexer.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ccls/files/patch-src_indexer.cc	Sat Apr 25 09:08:06 2020	(r532927)
@@ -0,0 +1,22 @@
+https://github.com/MaskRay/ccls/commit/b0d42ad8f2ef22d3a42eee6e7534fc363c018440
+
+--- src/indexer.cc.orig	2019-10-25 01:37:55 UTC
++++ src/indexer.cc
+@@ -677,10 +677,13 @@ class IndexDataConsumer : public index::IndexDataConsu
+ public:
+   IndexDataConsumer(IndexParam &param) : param(param) {}
+   void initialize(ASTContext &ctx) override { this->ctx = param.ctx = &ctx; }
+-  bool handleDeclOccurence(const Decl *d, index::SymbolRoleSet roles,
+-                           ArrayRef<index::SymbolRelation> relations,
+-                           SourceLocation src_loc,
+-                           ASTNodeInfo ast_node) override {
++#if LLVM_VERSION_MAJOR < 10 // llvmorg-10-init-12036-g3b9715cb219
++# define handleDeclOccurrence handleDeclOccurence
++#endif
++  bool handleDeclOccurrence(const Decl *d, index::SymbolRoleSet roles,
++                            ArrayRef<index::SymbolRelation> relations,
++                            SourceLocation src_loc,
++                            ASTNodeInfo ast_node) override {
+     if (!param.no_linkage) {
+       if (auto *nd = dyn_cast<NamedDecl>(d); nd && nd->hasLinkage())
+         ;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004250908.03P986l7024548>