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

[Backport 6.2] io.cpp: fix build on Solaris #1639

Merged
merged 3 commits into from Sep 26, 2019

Conversation

@backporting
Copy link

backporting bot commented Sep 25, 2019

Backport #1637.

rouault added 3 commits Sep 24, 2019
Rename CS template argument, to avoid conflict with macro in Solaris system headers.

Similar to 2f8bd93
Patches proj-6.2.0-hanato.gpatch and proj-6.2.0-mbtfpp.gpatch from Eric Dechaux
Patch proj-6.2.0-isea.gpatch by Eric Dechaux
@rouault rouault added this to the 6.2.1 milestone Sep 25, 2019
@kbevers kbevers merged commit 36fb1cb into 6.2 Sep 26, 2019
3 of 4 checks passed
3 of 4 checks passed
FreeBSD Task Summary
Details
Travis CI - Pull Request Build Passed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
coverage/coveralls Coverage remained the same at 85.884%
Details
@kbevers kbevers deleted the backport-1637-to-6.2 branch Oct 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.