mirror of
https://gitlab.isc.org/isc-projects/kea
synced 2025-08-31 14:05:33 +00:00
[5496] Merge branch 'fix_boost_1.66' of https://github.com/zorun/kea into trac5496
This commit is contained in:
@@ -47,7 +47,11 @@ public:
|
|||||||
|
|
||||||
/// @brief Returns file descriptor of the underlying socket.
|
/// @brief Returns file descriptor of the underlying socket.
|
||||||
virtual int getNative() const {
|
virtual int getNative() const {
|
||||||
|
#if BOOST_VERSION < 106600
|
||||||
return (acceptor_->native());
|
return (acceptor_->native());
|
||||||
|
#else
|
||||||
|
return (acceptor_->native_handle());
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/// @brief Opens acceptor socket given the endpoint.
|
/// @brief Opens acceptor socket given the endpoint.
|
||||||
|
@@ -11,7 +11,12 @@
|
|||||||
|
|
||||||
namespace boost {
|
namespace boost {
|
||||||
namespace asio {
|
namespace asio {
|
||||||
|
#if BOOST_VERSION < 106600
|
||||||
class io_service;
|
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
|
/// \brief Return file descriptor of underlying socket
|
||||||
virtual int getNative() const {
|
virtual int getNative() const {
|
||||||
|
#if BOOST_VERSION < 106600
|
||||||
return (socket_.native());
|
return (socket_.native());
|
||||||
|
#else
|
||||||
|
return (socket_.native_handle());
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/// \brief Return protocol of socket
|
/// \brief Return protocol of socket
|
||||||
|
@@ -61,7 +61,11 @@ public:
|
|||||||
|
|
||||||
/// \brief Return file descriptor of underlying socket
|
/// \brief Return file descriptor of underlying socket
|
||||||
virtual int getNative() const {
|
virtual int getNative() const {
|
||||||
|
#if BOOST_VERSION < 106600
|
||||||
return (socket_.native());
|
return (socket_.native());
|
||||||
|
#else
|
||||||
|
return (socket_.native_handle());
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/// \brief Return protocol of socket
|
/// \brief Return protocol of socket
|
||||||
|
@@ -287,7 +287,11 @@ UnixDomainSocket::UnixDomainSocket(IOService& io_service)
|
|||||||
|
|
||||||
int
|
int
|
||||||
UnixDomainSocket::getNative() const {
|
UnixDomainSocket::getNative() const {
|
||||||
|
#if BOOST_VERSION < 106600
|
||||||
return (impl_->socket_.native());
|
return (impl_->socket_.native());
|
||||||
|
#else
|
||||||
|
return (impl_->socket_.native_handle());
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
|
Reference in New Issue
Block a user