-
Notifications
You must be signed in to change notification settings - Fork 791
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
Fix complex member printing for DynamicDataHelper (backport #2957) #2965
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* DynamicDataHelper::print can print Sequences as well as Arrays Signed-off-by: Will Stott <willstott101@gmail.com> * Fix complex member printing Signed-off-by: methylDragon <methylDragon@gmail.com> * Clean up prints Signed-off-by: methylDragon <methylDragon@gmail.com> * Fix FastDDS windows CI error Signed-off-by: methylDragon <methylDragon@gmail.com> Signed-off-by: methylDragon <methylDragon@gmail.com> Co-authored-by: Will Stott <willstott101@gmail.com> (cherry picked from commit 78473a0) # Conflicts: # src/cpp/dynamic-types/DynamicDataHelper.cpp
13 tasks
MiguelCompany
added
no-test
Skip CI tests if PR marked with this label
no-aarch
Skip build & test for aarch64
labels
Sep 22, 2022
@methylDragon Would you mind resolving the conflicts here? |
I think that looks like the only conflict? |
Co-authored-by: methylDragon <methylDragon@gmail.com>
@richiprosima Please test this |
Looks like uncrustify is unhappy? There's another uncrustify warning occuring in line 61. I don't have access to edit that. |
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
MiguelCompany
approved these changes
Sep 30, 2022
Uncrustify is now happy, and build was successful. Going in. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #2957 done by Mergify.
Cherry-pick of 78473a0 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refresh
will re-evaluate the rules@Mergifyio rebase
will rebase this PR on its base branch@Mergifyio update
will merge the base branch into this PR@Mergifyio backport <destination>
will backport this PR on<destination>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com