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

Reflect changes in boost::asio released in Boost 1.66. #428

Merged
merged 1 commit into from Mar 11, 2018
Merged

Reflect changes in boost::asio released in Boost 1.66. #428

merged 1 commit into from Mar 11, 2018

Conversation

Raphnalor
Copy link
Contributor

The service template parameters, and the corresponding classes,
are disabled by default for now. For example,
basic_socket<Protocol, SocketService> => basic_socket

@Illithidek
Copy link
Member

I think that few boost versions should be supported backwards, if there is not much difference. Changing io_service to io_context is unnecesary and bad for backward compatibility. Check that typedef. So io_service can stay. Only thing that you need to change are forward declarations in CVCMIServer.h and Connection.h

alexvins
alexvins requested changes Mar 10, 2018
View reviewed changes
Copy link
Member

@alexvins alexvins left a comment

Choose a reason for hiding this comment

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

At first this should compile with CI and backward compatibility should be retained.

@ArseniyShestakov
Copy link
Member

There is already code suggested for this in PR #285 with compatibility for older Boost.
I'm little bit short of time recently, but as soon as I can I'll merge one or another.

@ArseniyShestakov
Copy link
Member

@Raphnalor so if you can test it and put it in this PR I'll be happy to accept it.
Later I can improve the code a bit once I finalize #402.

@Raphnalor
Reflect changes in boost::asio released in Boost 1.66.
f6f09a3 
The service template parameters are disabled by default for now.
Use BOOST_ASIO_ENABLE_OLD_SERVICES macro to enable the old interface.
@Raphnalor
Copy link
Contributor Author

I've fixed compatibility with older Boost versions.

@Raphnalor
Copy link
Contributor Author

Could someone press the "merge" button? It's not active for me.

@MarcinWieczorek
Copy link

Does this fix all compilation issues with boost 1.66?

@Raphnalor
Copy link
Contributor Author

Raphnalor commented Mar 11, 2018 •
edited

I was able to build VCMI with boost 1.66 on Windows without errors using this fix. There were a lot of warnings, they seem not to be related to boost 1.66, but I am not sure. And I haven't tested compilation on Linux.

@MarcinWieczorek
Copy link

I'm compiling it now.

@MarcinWieczorek
Copy link

It works.

@ArseniyShestakov
Copy link
Member

@Raphnalor merge button is just for team members regardless of "approved" state.
Thanks for your contribution!

@ArseniyShestakov ArseniyShestakov merged commit 83c6ffb into vcmi:develop Mar 11, 2018
@ArseniyShestakov ArseniyShestakov added the enhancement Improving beyond Heroes 3 behavior label Mar 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexvins alexvins alexvins approved these changes

Assignees
No one assigned
Labels
enhancement Improving beyond Heroes 3 behavior
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Raphnalor @Illithidek @ArseniyShestakov @MarcinWieczorek @alexvins