diff options
author | Tobias Kortkamp <tobik@FreeBSD.org> | 2020-04-25 09:08:06 +0000 |
---|---|---|
committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2020-04-25 09:08:06 +0000 |
commit | e115371e3e847df7bd6ad2cb1d1c1ba7e58b6ca1 (patch) | |
tree | ffe07baab3762affb90d27f5e94e886480f41f9d /devel/ccls | |
parent | 34aac1f954abca1339f7f4a3593358dac21de435 (diff) | |
download | ports-e115371e3e847df7bd6ad2cb1d1c1ba7e58b6ca1.tar.gz ports-e115371e3e847df7bd6ad2cb1d1c1ba7e58b6ca1.zip |
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.
Notes
Notes:
svn path=/head/; revision=532927
Diffstat (limited to 'devel/ccls')
-rw-r--r-- | devel/ccls/files/patch-src_indexer.cc | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/devel/ccls/files/patch-src_indexer.cc b/devel/ccls/files/patch-src_indexer.cc new file mode 100644 index 000000000000..afac210fe60c --- /dev/null +++ b/devel/ccls/files/patch-src_indexer.cc @@ -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 ¶m) : 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()) + ; |