From 21474893efe0ab38461c3d08727c7c778caa9323 Mon Sep 17 00:00:00 2001
From: Dennis Brentjes <d.brentjes@gmail.com>
Date: Sun, 4 Feb 2018 12:47:09 +0100
Subject: Both algorithms are now batchable.

---
 libcmix-network/acceptor.hpp | 1 +
 libcmix-network/connect.cpp  | 6 +++---
 libcmix-network/connect.hpp  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'libcmix-network')

diff --git a/libcmix-network/acceptor.hpp b/libcmix-network/acceptor.hpp
index eecc511..37f1bb1 100644
--- a/libcmix-network/acceptor.hpp
+++ b/libcmix-network/acceptor.hpp
@@ -4,6 +4,7 @@
 
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl.hpp>
+#include <boost/asio/io_service.hpp>
 
 #include <functional>
 
diff --git a/libcmix-network/connect.cpp b/libcmix-network/connect.cpp
index 4bebf9d..81c5800 100644
--- a/libcmix-network/connect.cpp
+++ b/libcmix-network/connect.cpp
@@ -54,7 +54,7 @@ struct IterationInfo {
 	{}
 };
 
-void async_connect_iteration(basic_socket<tcp, stream_socket_service<tcp>>& socket, std::shared_ptr<IterationInfo> info, std::function<void()> on_connect) {
+void async_connect_iteration(basic_socket<tcp>& socket, std::shared_ptr<IterationInfo> info, std::function<void()> on_connect) {
 	
 	if(info->it == boost::asio::ip::tcp::resolver::iterator()) {
 		throw std::runtime_error("None of the supplied endpoints responded");
@@ -99,7 +99,7 @@ void async_connect_iteration(basic_socket<tcp, stream_socket_service<tcp>>& sock
 	socket.async_connect(*(info->it), handler);
 }
 
-void async_connect(basic_socket<tcp, stream_socket_service<tcp>>& socket, std::string host, std::string port, std::function<void()> on_connect)
+void async_connect(basic_socket<tcp>& socket, std::string host, std::string port, std::function<void()> on_connect)
 {
 	boost::asio::ip::basic_resolver<tcp> resolver(socket.get_io_service());
 	boost::asio::ip::basic_resolver_query<tcp> query(host, port);
@@ -111,4 +111,4 @@ void async_connect(basic_socket<tcp, stream_socket_service<tcp>>& socket, std::s
 	std::shared_ptr<IterationInfo> info = std::make_shared<IterationInfo>(0, it, socket.get_io_service());
 	
 	async_connect_iteration(socket, info, on_connect);
-}
\ No newline at end of file
+}
diff --git a/libcmix-network/connect.hpp b/libcmix-network/connect.hpp
index ba70c70..caac09f 100644
--- a/libcmix-network/connect.hpp
+++ b/libcmix-network/connect.hpp
@@ -24,4 +24,4 @@ boost::asio::ip::tcp::socket connect(std::string host, std::string port, boost::
  * \param port The port
  * \param on_connect The function to call when the connect has succeeded.
  */
-void async_connect(boost::asio::basic_socket<boost::asio::ip::tcp, boost::asio::stream_socket_service<boost::asio::ip::tcp>>& socket, std::string host, std::string port, std::function<void()> on_connect);
\ No newline at end of file
+void async_connect(boost::asio::basic_socket<boost::asio::ip::tcp>& socket, std::string host, std::string port, std::function<void()> on_connect);
-- 
cgit v1.2.3-70-g09d2