diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-06-28 08:00:56 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-06-29 00:35:46 -0700 |
commit | f6c7adbcccfcde96d8fec988afde597ad910c690 (patch) | |
tree | 53b04194b96bda7ddbf2a1205aed1624cf9b0314 /meta-networking/recipes-connectivity/kea/files/0001-asiolink-fix-build-with-boost-1.66.patch | |
parent | 3e2d529c34ebe02babb5daf95e31e587fdcb3d6f (diff) | |
download | meta-openembedded-contrib-f6c7adbcccfcde96d8fec988afde597ad910c690.tar.gz |
kea: Upgrade to 1.4.0 release
Licence-Update:
* Co-routines are now used from external boost
* ISC Copyright years are updated to 2018
* Support for Google Benchmark has been added under Apache-2.0
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity/kea/files/0001-asiolink-fix-build-with-boost-1.66.patch')
-rw-r--r-- | meta-networking/recipes-connectivity/kea/files/0001-asiolink-fix-build-with-boost-1.66.patch | 103 |
1 files changed, 0 insertions, 103 deletions
diff --git a/meta-networking/recipes-connectivity/kea/files/0001-asiolink-fix-build-with-boost-1.66.patch b/meta-networking/recipes-connectivity/kea/files/0001-asiolink-fix-build-with-boost-1.66.patch deleted file mode 100644 index 9262381d5b..0000000000 --- a/meta-networking/recipes-connectivity/kea/files/0001-asiolink-fix-build-with-boost-1.66.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 4fd11ef050438adeb1e0ae0d9d2d8ec3a2cb659c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <bpiotrowski@archlinux.org> -Date: Sat, 30 Dec 2017 14:40:24 +0100 -Subject: [PATCH] asiolink: fix build with boost 1.66 - -- use native_handle() for getting native socket type -- use io_context instead of io_service - -Upstream-Status: Backport - -Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> ---- - src/lib/asiolink/io_acceptor.h | 4 ++++ - src/lib/asiolink/io_service.h | 5 +++++ - src/lib/asiolink/tcp_socket.h | 4 ++++ - src/lib/asiolink/udp_socket.h | 4 ++++ - src/lib/asiolink/unix_domain_socket.cc | 4 ++++ - 5 files changed, 21 insertions(+) - -diff --git a/src/lib/asiolink/io_acceptor.h b/src/lib/asiolink/io_acceptor.h -index c493d3427..913a3280b 100644 ---- a/src/lib/asiolink/io_acceptor.h -+++ b/src/lib/asiolink/io_acceptor.h -@@ -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. -diff --git a/src/lib/asiolink/io_service.h b/src/lib/asiolink/io_service.h -index e9e402d11..e0832b2c0 100644 ---- a/src/lib/asiolink/io_service.h -+++ b/src/lib/asiolink/io_service.h -@@ -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 - } - } - -diff --git a/src/lib/asiolink/tcp_socket.h b/src/lib/asiolink/tcp_socket.h -index adf74d1f0..83b8264c8 100644 ---- a/src/lib/asiolink/tcp_socket.h -+++ b/src/lib/asiolink/tcp_socket.h -@@ -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 -diff --git a/src/lib/asiolink/udp_socket.h b/src/lib/asiolink/udp_socket.h -index 07ba44743..5b040cfe1 100644 ---- a/src/lib/asiolink/udp_socket.h -+++ b/src/lib/asiolink/udp_socket.h -@@ -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 -diff --git a/src/lib/asiolink/unix_domain_socket.cc b/src/lib/asiolink/unix_domain_socket.cc -index f17ec2e8f..d1ad9ec30 100644 ---- a/src/lib/asiolink/unix_domain_socket.cc -+++ b/src/lib/asiolink/unix_domain_socket.cc -@@ -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 --- -2.11.0 - |