Skip to content

Merge upstream#7

Closed
Felixoid wants to merge 10 commits intomasterfrom
merge-upstream
Closed

Merge upstream#7
Felixoid wants to merge 10 commits intomasterfrom
merge-upstream

Conversation

@Felixoid
Copy link
Copy Markdown
Member

It's an updated upstream. I'll try to use it in the PR and we'll see if it works

Knarf64 and others added 10 commits September 7, 2021 16:05
Change-Id: Ia0fcca61f77e68c6226aed0097ded98e6bd70163
* Remove PPCallbacks::FileNotFound() override

Since according to [1] it had been broken anyway.

  [1]: llvm/llvm-project@7a124f4

* Include clang directories with -isystem/SYSTEM

This is to suppress errors like:

    In file included from /workdir/woboq_codebrowser/generator/commenthandler.cpp:27:
    In file included from /usr/lib/llvm-15/include/clang/AST/CommentParser.h:16:
    /usr/lib/llvm-15/include/clang/AST/Comment.h:149:54: warning: arithmetic between different enumeration types ('clang::comments::Comment::(unnamed enum at /usr/lib/llvm-15/include/clang/AST/Comment.h:66:3)' and 'clang::comments::CommandInfo::(unnamed enum at /usr/lib/llvm-15/include/clang/AST/CommentCommandTraits.h:43:3)') is deprecated [-Wdeprecated-anon-enum-enum-conversion]
      enum { NumBlockCommandCommentBits = NumCommentBits +
                                          ~~~~~~~~~~~~~~ ^

Refs: https://s3.amazonaws.com/clickhouse-test-reports/41046/f1df5fb537b97fa6e67db121995d72ecdf797cf7/push_to_dockerhub_aarch64.html

* Support llvm-15 for PreprocessorCallback::InclusionDirective()

Refs: llvm/llvm-project@d79ad2f1dbc2d
:wtherwise CMake complains.

Change-Id: I42446972417205623e3ff98f30da36ea9ceb4534
Reviewed-on: https://codereview.kdab.com/c/kdab/code_browser/+/120177
Reviewed-by: Franck Arrecot <[email protected]>
Parameter -b should point to the build directory containing compile_commands.json
@CLAassistant
Copy link
Copy Markdown

CLAassistant commented Feb 13, 2023

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 6 committers have signed the CLA.

✅ azat
✅ Felixoid
❌ Knarf64
❌ Waqar144
❌ krf
❌ daniel-petrovic
You have signed the CLA already but the status is still pending? Let us recheck it.

@azat
Copy link
Copy Markdown
Member

azat commented May 8, 2023

Can be closed in favor of #8

@Felixoid
Copy link
Copy Markdown
Member Author

Felixoid commented May 8, 2023

Sure thing, thanks!

@Felixoid Felixoid closed this May 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants