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.

Sign up for GitHub

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

Jump to bottom

[SofaKernel] FIX macro issue resulted from the #include cleaning. #672

Merged
merged 1 commit into from
Jun 1, 2018
Merged

[SofaKernel] FIX macro issue resulted from the #include cleaning. #672

merged 1 commit into from
Jun 1, 2018

Conversation

damienmarchal
Copy link
Contributor

@damienmarchal damienmarchal commented May 31, 2018 •
edited by guparan
Loading

Since #638 the PR breaks some #ifdef.
Here is fix for the #inclusion problem and a pattern to avoid this kind of problem to be repeated.

This PR:

  • builds with SUCCESS for all platforms on the CI.
  • does not generate new warnings.
  • does not generate new unit test failures.
  • does not generate new scene test failures.
  • does not break API compatibility.
  • is more than 1 week old (or has fast-merge label).

Reviewers will merge only if all these checks are true.

@damienmarchal damienmarchal added pr: fix Fix a bug pr: fast merge Minor change that can be merged without waiting for the 7 review days pr: status to review To notify reviewers to review this pull-request labels May 31, 2018
@guparan guparan merged commit 1da999d into sofa-framework:master Jun 1, 2018
@guparan guparan added pr: status ready Approved a pull-request, ready to be squashed and removed pr: status to review To notify reviewers to review this pull-request labels Jun 1, 2018
@guparan guparan added this to the v18.06 milestone Jun 18, 2018
@damienmarchal damienmarchal deleted the Sofa_fixInclusionProblemPR branch August 6, 2018 15:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
pr: fast merge Minor change that can be merged without waiting for the 7 review days pr: fix Fix a bug pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Milestone
v18.06
Development

Successfully merging this pull request may close these issues.
2 participants
@damienmarchal @guparan