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

[all] Fix warnings and strange double incrementation on iterator #364

Merged
merged 5 commits into from
Sep 1, 2017

Conversation

hugtalbot
Copy link
Contributor

@hugtalbot hugtalbot commented Aug 10, 2017

Some minor warnings and ...
FIX strange double incrementation on iterator in DefaultMultiMatrixAccessor.cpp : @ChristianDuriez @courtecuisse your review would be great !


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.

@hugtalbot hugtalbot added the pr: fix Fix a bug label Aug 10, 2017
@hugtalbot hugtalbot requested review from fredroy, courtecuisse and ChristianDuriez and removed request for fredroy August 10, 2017 13:49
@hugtalbot hugtalbot added the pr: status to review To notify reviewers to review this pull-request label Aug 10, 2017
@@ -954,10 +954,8 @@ void projection(LCP &fineLevel, LCP &coarseLevel, int nbContactsCoarse, const st
/// all parameters as input
/// output=> change value of F in fineLevel

void prolongation(LCP &fineLevel, LCP &coarseLevel, const std::vector<int> &projectionTable, const std::vector<int> &projectionConstraints, std::vector<double> & projectionValues, std::vector<bool> &contact_is_projected, bool verbose)

void prolongation(LCP &fineLevel, LCP &coarseLevel, const std::vector<int> &projectionTable, const std::vector<int> &projectionConstraints, std::vector<double> & projectionValues, std::vector<bool> &contact_is_projected, bool /*verbose*/)
Copy link
Contributor

Choose a reason for hiding this comment

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

I suggest using SOFA_UNUSED instead of commenting the function signature.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks @damienmarchal , correct the PR I will

@hugtalbot
Copy link
Contributor Author

Above @damienmarchal 's comment, this PR needs an overview regarding the code of the DefaultMultiMatrixAccessor

@hugtalbot hugtalbot 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 Aug 30, 2017
@hugtalbot
Copy link
Contributor Author

[ci-build]

@hugtalbot hugtalbot merged commit 893c3d3 into sofa-framework:master Sep 1, 2017
matthieu-nesme added a commit to Anatoscope/sofa that referenced this pull request Sep 6, 2017
[all] Fix warnings and strange double incrementation on iterator

(cherry picked from commit 893c3d3)
@guparan guparan modified the milestones: v17.06, v17.12 Sep 13, 2017
@hugtalbot hugtalbot deleted the fix_warnings_201708 branch January 3, 2018 14:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr: fix Fix a bug pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants