Skip to content

Fix Windows build #2482

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

Merged
merged 4 commits into from
Aug 12, 2016
Merged

Fix Windows build #2482

merged 4 commits into from
Aug 12, 2016

Conversation

Blaisorblade
Copy link
Collaborator

Fix the regressions from #2457.

Deduplicate code that I'll have to change to fix compilation on
Windows (and maybe a few other things).
To this end, define WINDOWS also in testsuite.
Note the issue is not triggered on AppVeyor, but it is triggered when
checking files out on Windows using recommended Git settings (Windows
newlines).

Workaround for
nikita-volkov/neat-interpolation#14, no more
necessary if that bug is fixed.

This defines a variant of shouldBe; while at it, also integrate needed
string type conversions.
@Blaisorblade Blaisorblade merged commit 8d86a79 into master Aug 12, 2016
@Blaisorblade Blaisorblade deleted the 2457-fix-win-build branch August 12, 2016 16:38
@Blaisorblade
Copy link
Collaborator Author

Merged. I'd still welcome a code review, as there are quite a few non-obvious choices involved. But I'm uneasy with a broken build & rank fixing the build higher, lest other regressions slip in.

@mgsloan
Copy link
Contributor

mgsloan commented Aug 12, 2016

LGTM, thanks for fixing!

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.

3 participants