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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/serializer/Connection.cpp
View file
Open in desktop
Expand Up @@ -14,6 +14,9 @@
#include "../mapping/CMap.h"
#include "../CGameState.h"

#if BOOST_VERSION >= 106600
#define BOOST_ASIO_ENABLE_OLD_SERVICES
#endif
#include <boost/asio.hpp>

using namespace boost;
Expand Down
6 changes: 6 additions & 0 deletions lib/serializer/Connection.h
View file
Open in desktop
Expand Up @@ -22,7 +22,13 @@ namespace boost
{
class tcp;
}

#if BOOST_VERSION >= 106600 // Boost version >= 1.66
class io_context;
typedef io_context io_service;
#else
class io_service;
#endif

template <typename Protocol> class stream_socket_service;
template <typename Protocol,typename StreamSocketService>
Expand Down
3 changes: 3 additions & 0 deletions server/CVCMIServer.cpp
View file
Open in desktop
Expand Up @@ -9,6 +9,9 @@
*/
#include "StdInc.h"

#if BOOST_VERSION >= 106600
#define BOOST_ASIO_ENABLE_OLD_SERVICES
#endif
#include <boost/asio.hpp>

#include "../lib/filesystem/Filesystem.h"
Expand Down
8 changes: 7 additions & 1 deletion server/CVCMIServer.h
View file
Open in desktop
Expand Up @@ -26,7 +26,13 @@ namespace boost
{
class tcp;
}
class io_service;

#if BOOST_VERSION >= 106600 // Boost version >= 1.66
class io_context;
typedef io_context io_service;
#else
class io_service;
#endif

template <typename Protocol> class stream_socket_service;
template <typename Protocol,typename StreamSocketService>
Expand Down