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

[upstream-utils][mpack] Add upstream util for mpack #4500

Merged
merged 5 commits into from
Nov 5, 2022

Conversation

pjreiniger
Copy link
Contributor

Does the upstream-util part of #4491. I'll leave the cmake part for people more familiar with cmake

@pjreiniger pjreiniger requested a review from a team as a code owner October 22, 2022 22:06
@PeterJohnson
Copy link
Member

Would it be better to amalgamate first and then patch the amalgamated version? It feels a bit odd reading the patch because there's unmatched namespace declarations, for example.

@pjreiniger
Copy link
Contributor Author

You can't really apply the patch to the amalgamated file because it is gitignore'd. You could apply the patch on the allwpilib side, but upstream utils moved away from that concept.

Instead I decided to patch the namespace in each c file. This way if it works with the un-amalgamated version of files as well.

@PeterJohnson PeterJohnson merged commit fa44a07 into wpilibsuite:main Nov 5, 2022
@pjreiniger pjreiniger deleted the upstream_mpack branch November 5, 2022 06:40
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.

2 participants