Skip to content
New issue

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

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

Already on GitHub? # to your account

Fix #1012, Include cfe_private.h in stubs #1013

Merged
merged 1 commit into from
Nov 13, 2020

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Nov 12, 2020

Describe the contribution
Fix #1012 - added inclusion of cfe_private.h for stubs that implement related elements

Testing performed
Built unit test, confirmed expected failure for CFE_ES_RegisterCDSEx (#1010)

Expected behavior changes
Avoids future divergence.

System(s) tested on

  • Hardware: cFS Dev Server
  • OS: Ubuntu 18.04
  • Versions: Bundle main + this commit

Additional context
Depends on #1011 to pass

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman - NASA/GSFC

Copy link
Contributor

@jphickey jphickey left a comment

Choose a reason for hiding this comment

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

I suppose this explains why the build didn't catch this type mismatch. Hopefully this is just a short term fix though -- Ideally I'd like to see the private/ subdir go away completely as part of the refactor proposed in #972.

@astrogeco astrogeco changed the base branch from main to integration-candidate November 13, 2020 19:44
@astrogeco astrogeco merged commit c6b2c86 into nasa:integration-candidate Nov 13, 2020
astrogeco added a commit to astrogeco/cFS that referenced this pull request Nov 13, 2020
astrogeco added a commit to nasa/cFS that referenced this pull request Nov 16, 2020
* Add nasa/cFE#984

* Add nasa/cFE#980

* Add nasa/cFE#867

* Add nasa/osal#638 and update cfe due to rebase

* Add nasa/cFE#987

* Add nasa/to_lab#64 and nasa/sample_app#104

* Add nasa/osal#643

* Add nasa/cFE#1000

* Add nasa/ci_lab#58

* Add doxygen fixes for nasa/osal#643

* Add nasa/cFE#1013

* Add nasa/cFE#1011

* Add nasa/ci_lab#61

* Add nasa/sample_app#109

* Bump versions and point to submodules main

Co-authored-by: Joseph Hickey <joseph.p.hickey@nasa.gov>
@skliper skliper deleted the fix1012-priv-inc-stub branch February 1, 2021 22:07
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Include cfe_private.h in stub implementations so they don't diverge
3 participants