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

VxWorks/C++ fixes #797

Merged
merged 17 commits into from
Jul 20, 2021
Merged

VxWorks/C++ fixes #797

merged 17 commits into from
Jul 20, 2021

Conversation

timcanham
Copy link
Collaborator

Originating Project/Creator @timcanham
Affected Component None, PrmBuffer.hpp/.cpp
Affected Architectures(s) All, portable code
Related Issue(s) None
Has Unit Tests (y/n) No, but verfied PrmDb
Builds Without Errors (y/n) y
Unit Tests Pass (y/n) y, PrmDb
Documentation Included (y/n) n/a

Change Description

Updated Fw/PrmBuffer private data member from m_data to m_bufferData to avoid collision with VxWorks m_data macro.

Rationale

Needs to be fixed to support VxWorks builds

Testing/Review Recommendations

Re-ran PrmDb as a check, but there are no references to the m_data member in PrmDb or the PrmDb unit tests.

Future Work

Note any additional work that will be done relating to this issue.

@timcanham timcanham self-assigned this Jun 29, 2021
@timcanham timcanham marked this pull request as draft June 29, 2021 02:33
@timcanham timcanham changed the title Update/prm buffer VxWorks/C++ fixes Jun 30, 2021
@timcanham timcanham requested a review from LeStarch July 15, 2021 16:24
@timcanham timcanham marked this pull request as ready for review July 16, 2021 17:09
Copy link
Collaborator

@LeStarch LeStarch left a comment

Choose a reason for hiding this comment

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

Just one change, used POINTER_CAST as the casting type for pointer -> int.

@LeStarch LeStarch self-requested a review July 20, 2021 22:09
@LeStarch LeStarch merged commit d589f0a into nasa:devel Jul 20, 2021
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