Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

clang-format adjustments (backport #3045) #3046

Merged
merged 5 commits into from
Sep 30, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 30, 2024


This is an automatic backport of pull request #3045 done by [Mergify](https://mergify.com).

Copy link
Contributor Author

mergify bot commented Sep 30, 2024

Cherry-pick of 7bd48d9 has failed:

On branch mergify/bp/0.28.x/pr-3045
Your branch is ahead of 'origin/0.28.x' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 7bd48d96f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/bmffimage.cpp

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Sep 30, 2024
@mergify mergify bot mentioned this pull request Sep 30, 2024
This is used nowhere.

Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit 10accd3)
Causes issues with newer clang-format.

Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit 52a081a)
Seems to cause issues with newer clang-format.

Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit 7bd48d9)
The former causes issues with newer clang-format.

Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit 7fe36b8)
A lot of these are wrong anyway, when adding static_assert, a lot fail.

Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit 1e80c28)
@kmilos kmilos added this to the v0.28.4 milestone Sep 30, 2024
@kmilos kmilos removed the conflicts label Sep 30, 2024
@kmilos kmilos merged commit 5d3f73f into 0.28.x Sep 30, 2024
59 of 62 checks passed
@mergify mergify bot deleted the mergify/bp/0.28.x/pr-3045 branch September 30, 2024 17:22
@kmilos kmilos added the refactoring Cleanup / Simplify code -> more readable / robust label Oct 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
refactoring Cleanup / Simplify code -> more readable / robust
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants