aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Sardara <msardara@cisco.com>2020-05-25 20:49:51 +0200
committerMauro Sardara <msardara@cisco.com>2020-05-25 20:49:51 +0200
commit0d89fdfc83be0be8d5211f2c25f6966aa14482eb (patch)
treedfddf1bd9d7815981b53aeb7a4fde275c9006684
parenta27536f3d1ce6c2f46aef61a29dd1f516644e663 (diff)
[HICN-616] Fix compilation issue with asio 1.16.v20.05
Change-Id: Id9af4820dae5ccbb9a5f41d604ede10958f30b69 Signed-off-by: Mauro Sardara <msardara@cisco.com>
-rw-r--r--apps/http-proxy/src/http_session.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/http-proxy/src/http_session.cc b/apps/http-proxy/src/http_session.cc
index 2c28146..ff50636 100644
--- a/apps/http-proxy/src/http_session.cc
+++ b/apps/http-proxy/src/http_session.cc
@@ -51,7 +51,12 @@ HTTPSession::HTTPSession(asio::ip::tcp::socket socket,
ContentReceivedCallback receive_callback,
OnConnectionClosed on_connection_closed_callback,
bool reverse)
- : io_service_(socket.get_io_service()),
+ :
+#if ((ASIO_VERSION / 100 % 1000) < 12)
+ io_service_(socket.get_io_service()),
+#else
+ io_service_((asio::io_context &)(socket.get_executor().context())),
+#endif
socket_(std::move(socket)),
resolver_(io_service_),
timer_(io_service_),