Skip to content

Fixing a boost Version Related Bug #358

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixing a boost Version Related Bug #358

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70a85a3
Merge pull request #1 from ipkn/master
khairy-mohamed Jan 4, 2020
b188bf5
fix get_io_service() for boost >= 1.7
khairy-mohamed Jan 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions include/crow/socket_adaptors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@
#include <boost/asio/ssl.hpp>
#endif
#include "crow/settings.h"


#if BOOST_VERSION >= 107000
#define GET_IO_SERVICE(s) ((boost::asio::io_context &)(s).get_executor().context())
#else
#define GET_IO_SERVICE(s) ((s).get_io_service())
#endif

namespace crow
{
using namespace boost;
Expand All @@ -19,7 +27,7 @@ namespace crow

boost::asio::io_service& get_io_service()
{
return socket_.get_io_service();
return GET_IO_SERVICE(socket_);
}

tcp::socket& raw_socket()
Expand Down Expand Up @@ -96,7 +104,7 @@ namespace crow

boost::asio::io_service& get_io_service()
{
return raw_socket().get_io_service();
return GET_IO_SERVICE(raw_socket());
}

template <typename F>
Expand Down