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

[All] FIX VS2017 build (Windows) #630

Merged
merged 2 commits into from
Apr 12, 2018
Merged

[All] FIX VS2017 build (Windows) #630

merged 2 commits into from
Apr 12, 2018

Conversation

guparan
Copy link
Contributor

@guparan guparan commented Apr 10, 2018 •
edited
Loading

This PR suggested by @alxbilger fixes build on Windows with VS2017.

Error was C2057: expected constant expression

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.

@guparan
[all] FIX VS2017 build (Windows)
b7b5d9b 
C2057: expected constant expression
@guparan guparan added pr: fix Fix a bug pr: status to review To notify reviewers to review this pull-request labels Apr 10, 2018
@guparan guparan requested a review from epernod April 10, 2018 12:33
@epernod
FIX: VS2017 another way: explicit template instantiations before the …
47ae31d 
…template is used. This fix error C2057 on stl container.
epernod
epernod reviewed Apr 10, 2018
View reviewed changes
Copy link
Contributor

@epernod epernod left a comment

Choose a reason for hiding this comment

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

I pushed a different fix: explicit template instantiations before the templated class is used.
This seems to do the trick and avoid to redefine new vector template definition.

@epernod
Copy link
Contributor

epernod commented Apr 11, 2018

[ci-build][with-scene-tests]

@guparan guparan added pr: status ready Approved a pull-request, ready to be squashed pr: fast merge Minor change that can be merged without waiting for the 7 review days and removed pr: status to review To notify reviewers to review this pull-request labels Apr 11, 2018
@guparan guparan merged commit ba519bc into sofa-framework:master Apr 12, 2018
gaurab4163 added a commit to gaurab4163/sofa that referenced this pull request Apr 17, 2018
@gaurab4163
Revert "[All] FIX VS2017 build (Windows) (sofa-framework#630)"
ce882f3 
This reverts commit ba519bc.
@guparan guparan deleted the fix_constant_expression branch April 27, 2018 07:42
@guparan guparan added this to the v18.06 milestone Jun 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@epernod epernod epernod left review comments

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
@guparan @epernod