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

Fixing removing the nullptr from join calls #425

Merged
merged 1 commit into from
May 23, 2024
Merged

Conversation

LeStarch
Copy link
Collaborator

@LeStarch LeStarch commented May 6, 2024

Closes issue #424

@LeStarch LeStarch requested a review from bocchino May 6, 2024 23:54
@bocchino
Copy link
Collaborator

bocchino commented May 7, 2024

Looks good, but can we hold off on merging this until nasa/fprime#2672 is merged into devel? Otherwise the code generated by FPP won't compile except against that PR branch, which looks like it's still in draft status.

@bocchino bocchino marked this pull request as draft May 7, 2024 00:34
@bocchino
Copy link
Collaborator

bocchino commented May 7, 2024

I'm going to make this a draft PR for now. We can make this and nasa/fprime#2672 ready for review at the same time.

@LeStarch
Copy link
Collaborator Author

LeStarch commented May 7, 2024

@bocchino I agree, this can hang out until the other is merged. Note: that one was a draft PR, but is now in-review. I was just cleaning up the CI tests before de-drafting it.

@bocchino bocchino marked this pull request as ready for review May 7, 2024 17:04
Copy link
Collaborator

@bocchino bocchino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Ready to merge once nasa/fprime#2672 (review) is merged.

@bocchino bocchino merged commit 697603c into nasa:main May 23, 2024
11 checks passed
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.

None yet

2 participants