Commit e9a8f3ca authored by Francis Dupont's avatar Francis Dupont
Browse files

[5496] Merge branch 'fix_boost_1.66' of https://github.com/zorun/kea into trac5496

parents 126e683f 4fd11ef0
......@@ -47,7 +47,11 @@ public:
/// @brief Returns file descriptor of the underlying socket.
virtual int getNative() const {
#if BOOST_VERSION < 106600
return (acceptor_->native());
#else
return (acceptor_->native_handle());
#endif
}
/// @brief Opens acceptor socket given the endpoint.
......
......@@ -11,7 +11,12 @@
namespace boost {
namespace asio {
#if BOOST_VERSION < 106600
class io_service;
#else
class io_context;
typedef io_context io_service;
#endif
}
}
......
......@@ -75,7 +75,11 @@ public:
/// \brief Return file descriptor of underlying socket
virtual int getNative() const {
#if BOOST_VERSION < 106600
return (socket_.native());
#else
return (socket_.native_handle());
#endif
}
/// \brief Return protocol of socket
......
......@@ -61,7 +61,11 @@ public:
/// \brief Return file descriptor of underlying socket
virtual int getNative() const {
#if BOOST_VERSION < 106600
return (socket_.native());
#else
return (socket_.native_handle());
#endif
}
/// \brief Return protocol of socket
......
......@@ -287,7 +287,11 @@ UnixDomainSocket::UnixDomainSocket(IOService& io_service)
int
UnixDomainSocket::getNative() const {
#if BOOST_VERSION < 106600
return (impl_->socket_.native());
#else
return (impl_->socket_.native_handle());
#endif
}
int
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment