mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-23 03:05:48 +03:00
61 lines
2.1 KiB
Diff
61 lines
2.1 KiB
Diff
Description: Fix FTBFS against boost1.74
|
|
Author: Anton Gladky <gladk@debian.org>
|
|
Bug-Debian: https://bugs.debian.org/977219
|
|
Last-Update: 2020-12-14
|
|
|
|
Index: anytun-0.3.7/src/syncTcpConnection.cpp
|
|
===================================================================
|
|
--- src/syncTcpConnection.cpp
|
|
+++ src/syncTcpConnection.cpp
|
|
@@ -67,7 +67,12 @@ void SyncTcpConnection::Send(std::string
|
|
boost::asio::placeholders::bytes_transferred));
|
|
}
|
|
|
|
-#if BOOST_VERSION >= 107000
|
|
+#if BOOST_VERSION >= 107300
|
|
+SyncTcpConnection::SyncTcpConnection(const boost::asio::basic_socket_acceptor<boost::asio::ip::tcp>::executor_type& executor)
|
|
+ : socket_(executor)
|
|
+{
|
|
+}
|
|
+#elif BOOST_VERSION >= 107000
|
|
SyncTcpConnection::SyncTcpConnection(const boost::asio::executor& executor)
|
|
: socket_(executor)
|
|
{
|
|
Index: anytun-0.3.7/src/syncTcpConnection.h
|
|
===================================================================
|
|
--- src/syncTcpConnection.h
|
|
+++ src/syncTcpConnection.h
|
|
@@ -46,6 +46,9 @@
|
|
#ifndef ANYTUN_syncTcpConnection_h_INCLUDED
|
|
#define ANYTUN_syncTcpConnection_h_INCLUDED
|
|
|
|
+#define BOOST_ASIO_NO_TS_EXECUTORS
|
|
+
|
|
+
|
|
#include <boost/shared_ptr.hpp>
|
|
#include <boost/enable_shared_from_this.hpp>
|
|
#include <boost/function.hpp>
|
|
@@ -60,7 +63,11 @@ public:
|
|
typedef boost::shared_ptr<SyncTcpConnection> pointer;
|
|
typedef boost::asio::ip::tcp proto;
|
|
|
|
-#if BOOST_VERSION >= 107000
|
|
+#if BOOST_VERSION >= 107300
|
|
+ static pointer create(const boost::asio::basic_socket_acceptor<boost::asio::ip::tcp>::executor_type& executor) {
|
|
+ return pointer(new SyncTcpConnection(executor));
|
|
+ };
|
|
+#elif BOOST_VERSION >= 107000
|
|
static pointer create(const boost::asio::executor& executor) {
|
|
return pointer(new SyncTcpConnection(executor));
|
|
};
|
|
@@ -76,7 +83,9 @@ public:
|
|
void start();
|
|
void Send(std::string message);
|
|
private:
|
|
-#if BOOST_VERSION >= 107000
|
|
+#if BOOST_VERSION >= 107300
|
|
+ SyncTcpConnection(const boost::asio::basic_socket_acceptor<boost::asio::ip::tcp>::executor_type& executor);
|
|
+#elif BOOST_VERSION >= 107000
|
|
SyncTcpConnection(const boost::asio::executor& executor);
|
|
#else
|
|
SyncTcpConnection(boost::asio::io_service& io_service);
|