fix use of incomplete io_service type

arvidn · Mar 30, 2018 · 8905f8a · 8905f8a
1 parent 26c08bd
commit 8905f8a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/include/simulator/simulator.hpp b/include/simulator/simulator.hpp
@@ -169,11 +169,7 @@ namespace sim
 		using reuse_address = boost::asio::socket_base::reuse_address;
 #if BOOST_VERSION >= 106600
 		using executor_type = boost::asio::ip::tcp::socket::executor_type;
-
-		executor_type get_executor()
-		{
-			return m_io_service.get_executor();
-		}
+		executor_type get_executor();
 #endif
 
 		// socket options
@@ -1171,11 +1167,7 @@ namespace sim
 
 #if BOOST_VERSION >= 106600
 		using executor_type = boost::asio::io_service::executor_type;
-
-		executor_type get_executor()
-		{
-			return get_internal_service().get_executor();
-		}
+		executor_type get_executor();
 #endif
 
 
@@ -1253,6 +1245,15 @@ namespace sim
 		bool m_stopped = false;
 	};
 
+#if BOOST_VERSION >= 106600
+	template <typename Protocol>
+	typename socket_base<Protocol>::executor_type
+	socket_base<Protocol>::get_executor()
+	{
+		return m_io_service.get_executor();
+	}
+#endif
+
 	template <typename Protocol>
 	route socket_base<Protocol>::get_incoming_route()
 	{

diff --git a/src/io_service.cpp b/src/io_service.cpp
@@ -55,6 +55,13 @@ namespace sim { namespace asio {
 		assert(false);
 	}
 
+#if BOOST_VERSION >= 106600
+	io_service::executor_type io_service::get_executor()
+	{
+		return get_internal_service().get_executor();
+	}
+#endif
+
 	int io_service::get_path_mtu(const asio::ip::address& source, const asio::ip::address& dest) const
 	{
 		// TODO: it would be nice to actually traverse the virtual network nodes